summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:46:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:46:12 -0700
commitff7e96b78f3ad9db61fbdfdeaf7b71f254f76310 (patch)
tree5931ff763db1eefc6345a4ab54247095f595f2f7
parentMerge branch 'ow/config-mailmap-pathname' into maint (diff)
parentcompletion: add missing options for git-merge (diff)
downloadtgif-ff7e96b78f3ad9db61fbdfdeaf7b71f254f76310.tar.xz
Merge branch 'jk/complete-merge-pull' into maint
The completion scripts (in contrib/) did not know about quite a few options that are common between "git merge" and "git pull", and a couple of options unique to "git merge". * jk/complete-merge-pull: completion: add missing options for git-merge completion: add a note that merge options are shared
-rw-r--r--contrib/completion/git-completion.bash6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2c59a76bc2..019026efcb 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1472,9 +1472,12 @@ _git_log ()
__git_complete_revlist
}
+# Common merge options shared by git-merge(1) and git-pull(1).
__git_merge_options="
--no-commit --no-stat --log --no-log --squash --strategy
--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
+ --verify-signatures --no-verify-signatures --gpg-sign
+ --quiet --verbose --progress --no-progress
"
_git_merge ()
@@ -1483,7 +1486,8 @@ _git_merge ()
case "$cur" in
--*)
- __gitcomp "$__git_merge_options"
+ __gitcomp "$__git_merge_options
+ --rerere-autoupdate --no-rerere-autoupdate --abort"
return
esac
__gitcomp_nl "$(__git_refs)"