summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-16 19:17:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-16 19:17:53 (GMT)
commit5cf2c571d08f38b90887d41d5c03376714f0b00d (patch)
treeb4bd9d0b1363e854346168319d2445df32c3d5d5 /contrib
parenta634a6d209fc67ed8fb58925a6ae713b2a913a83 (diff)
parent8fee8726470bd63db6c396ea6208ea487eaa8fab (diff)
downloadgit-5cf2c571d08f38b90887d41d5c03376714f0b00d.zip
git-5cf2c571d08f38b90887d41d5c03376714f0b00d.tar.gz
git-5cf2c571d08f38b90887d41d5c03376714f0b00d.tar.bz2
Merge branch 'jk/complete-merge-pull'
The completion code 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
Diffstat (limited to 'contrib')
-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 2c59a76..019026e 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)"