From aad070922157d3249af7095ecff6ebc074c13bb9 Mon Sep 17 00:00:00 2001 From: Adrian Weimann Date: Mon, 30 Jan 2012 20:29:33 +0100 Subject: completion: --edit and --no-edit for git-merge Signed-off-by: Adrian Weimann Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 1496c6dc05..78be195838 100755 --- 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 () -- cgit v1.2.1