Permalink
Browse files

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>
  • Loading branch information...
1 parent f2120eb commit 2ff14e31bd8c91356d54b7bac064e7cc615e56b3 @awde awde committed with gitster Jan 30, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 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 ()

0 comments on commit 2ff14e3

Please sign in to comment.