[PATCH] completion: --edit and --no-edit for git-merge
From: Adrian Weimann <hidden>
Date: 2016-06-15 22:52:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Adrian Weimann <redacted> --- contrib/completion/git-completion.bash | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1496c6d..78be195 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 ()
--
1.7.9