completion: add a note that merge options are shared
This should avoid future confusion after a subsequent patch has added some options to __git_merge_options and some directly in _git_merge(). 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
6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f
1 file changed
+1
contrib/completion/git-completion.bash
+1
@@ -1472,6 +1472,7 @@ _git_log ()
1472
__git_complete_revlist
1473
}
1474
1475
+# Common merge options shared by git-merge(1) and git-pull(1).
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