From: John Keeping Date: Thu, 22 May 2014 13:58:37 +0000 (+0100) Subject: completion: add a note that merge options are shared X-Git-Tag: v2.0.1~22^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2c59a76bc2..ff97c200ee 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1472,6 +1472,7 @@ _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