completion: --edit and --no-edit for git-merge
Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Adrian Weimann committed
Jan 30, 2012 at 20:29 UTC
aad070922157d3249af7095ecff6ebc074c13bb9
1 file changed
+1
-1
contrib/completion/git-completion.bash
+1
-1
@@ -1622,7 +1622,7 @@ _git_log ()
1622
1623
__git_merge_options="
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
"
1627
1628
_git_merge ()