summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e793cfc0..8dd3bd9e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-08-31  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
+	* unposted: Completion/Unix/Command/_git: git describe's
+	--long and --abbrev options are not mutually exclusive
+
 	* 43359: Completion/Unix/Command/_git:
 	further review of git remote set-url completion
 
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 1e19a03a4..2cae4c82f 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -738,11 +738,11 @@ _git-describe () {
     '--all[use any ref found in "$GIT_DIR/refs/"]' \
     '--tags[use any ref found in "$GIT_DIR/refs/tags"]' \
     '(--tags)--contains[find the tag after the commit instead of before]' \
-    '(--long)--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' \
+    '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' \
     '(             --exact-match)--candidates=[consider up to given number of candidates]: :__git_guard_number "number of candidates"' \
     '(--candidates              )--exact-match[only output exact matches, same as --candidates=0]' \
     '--debug[display information about the searching strategy]' \
-    '(--abbrev)--long[always show full format, even for exact matches]' \
+    '--long[always show full format, even for exact matches]' \
     '*--match=[only consider tags matching glob pattern]:pattern' \
     "*--exclude=[don't consider tags matching glob pattern]:pattern" \
     '--always[show uniquely abbreviated commit object as fallback]' \