summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-11 21:23:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-11 21:23:56 (GMT)
commit465868a22540d15d024ea4f8e2f4cfddf8f2edd7 (patch)
tree0dbb24e2318614cb93e9b7861c1226b136521b06 /contrib
parent02f8203740c63a2a8f2f63979b46ecfce976dfc0 (diff)
parentaf16bdaa3fb25bd5811b09bc11c9244b1dcc684e (diff)
downloadgit-465868a22540d15d024ea4f8e2f4cfddf8f2edd7.zip
git-465868a22540d15d024ea4f8e2f4cfddf8f2edd7.tar.gz
git-465868a22540d15d024ea4f8e2f4cfddf8f2edd7.tar.bz2
Merge branch 'sg/complete-decorate-full-not-long'
The completion for "log --decorate=" parameter value was incorrect. * sg/complete-decorate-full-not-long: completion: fix and update 'git log --decorate=' options
Diffstat (limited to 'contrib')
-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 5944c82..eae9dce 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
;;
--*)