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>
John Keeping committed
May 22, 2014 at 14:58 UTC
8fee8726470bd63db6c396ea6208ea487eaa8fab
1 file changed
+4
-1
contrib/completion/git-completion.bash
+4
-1
@@ -1476,6 +1476,8 @@ _git_log ()
1476
__git_merge_options="
1477
--no-commit --no-stat --log --no-log --squash --strategy
1478
--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
1479
+ --verify-signatures --no-verify-signatures --gpg-sign
1480
+ --quiet --verbose --progress --no-progress
1481
"
1482
1483
_git_merge ()
@@ -1484,7 +1486,8 @@ _git_merge ()
1486
1487
case "$cur" in
1488
--*)
1487
- __gitcomp "$__git_merge_options"
1489
+ __gitcomp "$__git_merge_options
1490
+ --rerere-autoupdate --no-rerere-autoupdate --abort"
1491
return
1492
esac
1493
__gitcomp_nl "$(__git_refs)"