# [PATCH] completion: --edit option for git-merge 3 messages from 2012-01-30 to 2012-01-30. Participants: Adrian Weimann, Junio C Hamano. Thread: https://gitlist.dev/t/29477 ## Adrian Weimann, 2012-01-30 13:37 Subject: [PATCH] completion: --edit option for git-merge Message-ID: <1327930670-32396-1-git-send-email-adrian.weimann@googlemail.com> URL: https://gitlist.dev/e/1327930670-32396-1-git-send-email-adrian.weimann%40googlemail.com ``` Signed-off-by: Adrian Weimann --- 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..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, 2012-01-30 18:15 Subject: Re: [PATCH] completion: --edit option for git-merge Message-ID: <7vhazdcazt.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vhazdcazt.fsf%40alter.siamese.dyndns.org In-Reply-To: <1327930670-32396-1-git-send-email-adrian.weimann@googlemail.com> ``` 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, 2012-01-30 19:29 Subject: [PATCH] completion: --edit and --no-edit for git-merge Message-ID: <1327951773-7813-1-git-send-email-adrian.weimann@googlemail.com> URL: https://gitlist.dev/e/1327951773-7813-1-git-send-email-adrian.weimann%40googlemail.com In-Reply-To: <7vhazdcazt.fsf@alter.siamese.dyndns.org> ``` Signed-off-by: Adrian Weimann --- 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 ```