From: John Keeping Date: Thu, 22 May 2014 13:58:38 +0000 (+0100) Subject: completion: add missing options for git-merge X-Git-Tag: v2.0.1~22^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fee8726470bd63db6c396ea6208ea487eaa8fab;p=thirdparty%2Fgit.git completion: add missing options for git-merge The options added to __git_merge_options are those that git-pull passes to git-merge, since that variable is used by both commands. Those added directly in _git_merge() are specific to git-merge and are not passed thru from git-pull. Reported-by: Haralan Dobrev Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ff97c200ee..019026efcb 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1476,6 +1476,8 @@ _git_log () __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 () @@ -1484,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)"