diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-02 16:46:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 16:46:52 -0700 |
| commit | 7e590a1afe350393356fbecdd44a43a42ddfad34 (patch) | |
| tree | 0ff3bfac8994607bda7188f1c19895c965fb96ce /merge-options.txt | |
| parent | c710296399a86586e3a5e24ea8519ea2442ab7cf (diff) | |
| download | git-htmldocs-7e590a1afe350393356fbecdd44a43a42ddfad34.tar.gz | |
Autogenerated HTML docs for v1.8.3-182-gb2edae
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index 2adccf8fe..afba8d4f3 100644 --- a/merge-options.txt +++ b/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. + |