{"thread":{"id":"29477","subject":"[PATCH] completion: --edit option for git-merge","startedAt":"2012-01-30T13:37:50Z","lastAt":"2012-01-30T19:29:33Z","messageCount":3,"participants":["Adrian Weimann","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"183320","messageId":"1327930670-32396-1-git-send-email-adrian.weimann@googlemail.com","threadId":"29477","inReplyTo":null,"subject":"[PATCH] completion: --edit option for git-merge","fromName":"Adrian Weimann","fromEmail":"adrian.weimann@googlemail.com","sentAt":"2012-01-30T13:37:50Z","receivedAt":"2012-01-30T13:37:50Z","isPatch":true,"sender":{"key":"adrian.weimann@googlemail.com","avatar":null},"body":"Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>\n---\n contrib/completion/git-completion.bash |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 1496c6d..be1fcea 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1622,7 +1622,7 @@ _git_log ()\n \n __git_merge_options=\"\n \t--no-commit --no-stat --log --no-log --squash --strategy\n-\t--commit --stat --no-squash --ff --no-ff --ff-only\n+\t--commit --stat --no-squash --ff --no-ff --ff-only --edit\n \"\n \n _git_merge ()\n-- \n1.7.9\n"},{"id":"183349","messageId":"7vhazdcazt.fsf@alter.siamese.dyndns.org","threadId":"29477","inReplyTo":"1327930670-32396-1-git-send-email-adrian.weimann@googlemail.com","subject":"Re: [PATCH] completion: --edit option for git-merge","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-30T18:15:50Z","receivedAt":"2012-01-30T18:15:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n\nOnce we start suggesting --edit, don't we also need to suggest --no-edit,\nwhich I think is more important for two reasons.\n"},{"id":"183368","messageId":"1327951773-7813-1-git-send-email-adrian.weimann@googlemail.com","threadId":"29477","inReplyTo":"7vhazdcazt.fsf@alter.siamese.dyndns.org","subject":"[PATCH] completion: --edit and --no-edit for git-merge","fromName":"Adrian Weimann","fromEmail":"adrian.weimann@googlemail.com","sentAt":"2012-01-30T19:29:33Z","receivedAt":"2012-01-30T19:29:33Z","isPatch":true,"sender":{"key":"adrian.weimann@googlemail.com","avatar":null},"body":"Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>\n---\n contrib/completion/git-completion.bash |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 1496c6d..78be195 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1622,7 +1622,7 @@ _git_log ()\n \n __git_merge_options=\"\n \t--no-commit --no-stat --log --no-log --squash --strategy\n-\t--commit --stat --no-squash --ff --no-ff --ff-only\n+\t--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit\n \"\n \n _git_merge ()\n-- \n1.7.9\n"}]}