summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-26 13:49:22 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-26 13:49:22 -0700
commit23903b9e290afeb6928955ee589799ee1a3c4c73 (patch)
treef52ec671801aef467ae8ee35e35b1f3d75f44f6d
parenta2e5c79c69ee6109b06efe9a483df5e6708432fe (diff)
parentaf16bdaa3fb25bd5811b09bc11c9244b1dcc684e (diff)
downloadgit-23903b9e290afeb6928955ee589799ee1a3c4c73.tar.gz
Merge branch 'sg/complete-decorate-full-not-long' into maint
The completion for "log --decorate=" parameter value was incorrect. * sg/complete-decorate-full-not-long: completion: fix and update 'git log --decorate=' options
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5944c824ab..eae9dce590 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1448,7 +1448,7 @@ _git_log ()
return
;;
--decorate=*)
- __gitcomp "long short" "" "${cur##--decorate=}"
+ __gitcomp "full short no" "" "${cur##--decorate=}"
return
;;
--*)