completion: add a note that merge options are shared

johnkeeping · gitster · commit 6d2b06f02b9c · 2014-05-27T12:27:36.000-07:00
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 &lt;john@keeping.me.uk&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1472,6 +1472,7 @@ _git_log ()`
`1472`	`1472`	`__git_complete_revlist`
`1473`	`1473`	`}`
`1474`	`1474`
	`1475`	`+# Common merge options shared by git-merge(1) and git-pull(1).`
`1475`	`1476`	`__git_merge_options="`
`1476`	`1477`	`--no-commit --no-stat --log --no-log --squash --strategy`
`1477`	`1478`	`--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit`