From: Adrian Weimann <adrian.weimann@googlemail.com>
Date: Mon, 30 Jan 2012 19:29:33 +0000 (+0100)
Subject: completion: --edit and --no-edit for git-merge
X-Git-Tag: v1.7.10-rc0~134
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aad070922157d3249af7095ecff6ebc074c13bb9;p=git.git

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>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1496c6dc0..78be19583 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 ()