summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-11 14:23:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-11 14:23:56 -0700
commit465868a22540d15d024ea4f8e2f4cfddf8f2edd7 (patch)
tree0dbb24e2318614cb93e9b7861c1226b136521b06
parentMerge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' (diff)
parentcompletion: fix and update 'git log --decorate=' options (diff)
downloadtgif-465868a22540d15d024ea4f8e2f4cfddf8f2edd7.tar.xz
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
-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
;;
--*)