mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-09 23:26:12 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2014-06-16 12:17:53 -07:00
parent a634a6d209 8fee872647
commit 5cf2c571d0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/completion/git-completion.bash
View File

@ -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)"