# [PATCH] Documentation/merge-options.txt: restore `-e` option 2 messages from 2013-05-16 to 2013-05-16. Participants: Richard Hansen, Junio C Hamano. Thread: https://gitlist.dev/t/33844 ## Richard Hansen, 2013-05-16 22:26 Subject: [PATCH] Documentation/merge-options.txt: restore `-e` option Message-ID: <1368743160-11866-1-git-send-email-rhansen@bbn.com> URL: https://gitlist.dev/e/1368743160-11866-1-git-send-email-rhansen%40bbn.com ``` It looks like commit f8246281af9adb0fdddbcc90d2e19cb5cd5217e5 unintentionally removed the documentation for the `-e` option. Signed-off-by: Richard Hansen --- Documentation/merge-options.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 34a8445..f192cd2 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -8,12 +8,13 @@ failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing. --edit:: +-e:: --no-edit:: Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally - discouraged). The `--edit` option is still useful if you are + discouraged). The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor. + -- 1.8.2.3 ``` ## Junio C Hamano, 2013-05-16 23:39 Subject: Re: [PATCH] Documentation/merge-options.txt: restore `-e` option Message-ID: <7vbo8a336p.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbo8a336p.fsf%40alter.siamese.dyndns.org In-Reply-To: <1368743160-11866-1-git-send-email-rhansen@bbn.com> ``` Thanks. ```