diff options
| author | John Keeping <john@keeping.me.uk> | 2014-05-22 14:58:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-27 12:27:50 -0700 |
| commit | 8fee8726470bd63db6c396ea6208ea487eaa8fab (patch) | |
| tree | 725190b47e313793c1c7762c56b6eb8860f94ffc /contrib | |
| parent | 6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f (diff) | |
| download | git-8fee8726470bd63db6c396ea6208ea487eaa8fab.tar.gz git-8fee8726470bd63db6c396ea6208ea487eaa8fab.tar.xz | |
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 <hkdobrev@gmail.com>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ff97c200e..019026efc 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)" |