completion: --edit and --no-edit for git-merge

awde · gitster · commit 2ff14e31bd8c · 2012-02-06T00:00:54.000-08:00
Signed-off-by: Adrian Weimann &lt;adrian.weimann@googlemail.com&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
@@ -1622,7 +1622,7 @@ _git_log ()
 
 __git_merge_options="
 	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff --ff-only
+	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
 "
 
 _git_merge ()

Original file line number	Diff line number	Diff line change
`@@ -1622,7 +1622,7 @@ _git_log ()`
`1622`	`1622`
`1623`	`1623`	`__git_merge_options="`
`1624`	`1624`	`--no-commit --no-stat --log --no-log --squash --strategy`
`1625`		`- --commit --stat --no-squash --ff --no-ff --ff-only`
	`1625`	`+ --commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit`
`1626`	`1626`	`"`
`1627`	`1627`
`1628`	`1628`	`_git_merge ()`