threads / patch / 29477

patchcompletion: --edit option for git-merge

Subject: [PATCH] completion: --edit option for git-merge

## tl;dr

3 messages between Jan 30, 2012 and Jan 30, 2012. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Adrian Weimann· Jan 30, 2012, 13:37 UTC · lore

Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to contrib/completion/git-completion.bash +1 −1

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1496c6d..be1fcea 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
 "
 
 _git_merge ()

-- 
1.7.9

Junio C Hamano· Jan 30, 2012, 18:15 UTC · re: Adrian Weimann · lore

Re: [PATCH] completion: --edit option for git-merge

Thanks.

Once we start suggesting --edit, don't we also need to suggest --no-edit, which I think is more important for two reasons.

Adrian Weimann· Jan 30, 2012, 19:29 UTC · re: Junio C Hamano · lore

[PATCH] completion: --edit and --no-edit for git-merge

Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to contrib/completion/git-completion.bash +1 −1

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