summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 10:41:33 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-03 10:41:33 -0700
commit44737c42280e513b782d73a790daf68f951237c3 (patch)
tree4418c327868757c98c7743d81b997838ded61d92
parentc36e465aca712cea70cb9570a1e7136e5de36b76 (diff)
parent72dbb365547a926f629e12d7eba39c3c0bb8ba84 (diff)
downloadgit-44737c42280e513b782d73a790daf68f951237c3.tar.gz
Merge branch 'sg/completion-commit-cleanup' into maint
* sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup='
-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 eae9dce590..3b1a9b1d4f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1114,7 +1114,7 @@ _git_commit ()
case "$cur" in
--cleanup=*)
- __gitcomp "default strip verbatim whitespace
+ __gitcomp "default scissors strip verbatim whitespace
" "" "${cur##--cleanup=}"
return
;;