summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-13 21:12:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-13 21:12:40 (GMT)
commitf0442976149da225fd9e7796436b2122a6bb7f0f (patch)
tree07db193c44d53613b45da628209522ee42ba4f5f /contrib
parentb330051982756f2f18a6718e603ceb99302dc16e (diff)
parentd3bfbf91dfb4257b064cce6e5860e8e7317e6da8 (diff)
downloadgit-f0442976149da225fd9e7796436b2122a6bb7f0f.zip
git-f0442976149da225fd9e7796436b2122a6bb7f0f.tar.gz
git-f0442976149da225fd9e7796436b2122a6bb7f0f.tar.bz2
Merge branch 'mg/complete-cherry-mark-to-log'
The completion scripts (in contrib/) did not include the "--cherry-mark" option when completing "git log <HT>". * mg/complete-cherry-mark-to-log: completion: complete --cherry-mark for git log
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ffe6004..3402475 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1458,6 +1458,7 @@ _git_log ()
--relative-date --date=
--pretty= --format= --oneline
--show-signature
+ --cherry-mark
--cherry-pick
--graph
--decorate --decorate=