{"thread":{"id":"33844","subject":"[PATCH] Documentation/merge-options.txt: restore `-e` option","startedAt":"2013-05-16T22:26:00Z","lastAt":"2013-05-16T23:39:10Z","messageCount":2,"participants":["Richard Hansen","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"217656","messageId":"1368743160-11866-1-git-send-email-rhansen@bbn.com","threadId":"33844","inReplyTo":null,"subject":"[PATCH] Documentation/merge-options.txt: restore `-e` option","fromName":"Richard Hansen","fromEmail":"rhansen@bbn.com","sentAt":"2013-05-16T22:26:00Z","receivedAt":"2013-05-16T22:26:00Z","isPatch":true,"sender":{"key":"rhansen@rhansen.org","avatar":null},"body":"It looks like commit f8246281af9adb0fdddbcc90d2e19cb5cd5217e5\nunintentionally removed the documentation for the `-e` option.\n\nSigned-off-by: Richard Hansen <rhansen@bbn.com>\n---\n Documentation/merge-options.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex 34a8445..f192cd2 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -8,12 +8,13 @@ failed and do not autocommit, to give the user a chance to\n inspect and further tweak the merge result before committing.\n \n --edit::\n+-e::\n --no-edit::\n \tInvoke an editor before committing successful mechanical merge to\n \tfurther edit the auto-generated merge message, so that the user\n \tcan explain and justify the merge. The `--no-edit` option can be\n \tused to accept the auto-generated message (this is generally\n-\tdiscouraged). The `--edit` option is still useful if you are\n+\tdiscouraged). The `--edit` (or `-e`) option is still useful if you are\n \tgiving a draft message with the `-m` option from the command line\n \tand want to edit it in the editor.\n +\n-- \n1.8.2.3\n"},{"id":"217663","messageId":"7vbo8a336p.fsf@alter.siamese.dyndns.org","threadId":"33844","inReplyTo":"1368743160-11866-1-git-send-email-rhansen@bbn.com","subject":"Re: [PATCH] Documentation/merge-options.txt: restore `-e` option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-05-16T23:39:10Z","receivedAt":"2013-05-16T23:39:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}