diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-02 12:56:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-02 12:56:35 -0700 |
| commit | b52ab19d91015ebd6bebc83a82b2c3d64b948b36 (patch) | |
| tree | 56c03a113b6d6e5597f3e73ece62879c6268da45 /Documentation/merge-options.txt | |
| parent | string-list: document that string_list_insert() inserts unique strings (diff) | |
| parent | merge: backport GIT_MERGE_AUTOEDIT support (diff) | |
| download | tgif-b52ab19d91015ebd6bebc83a82b2c3d64b948b36.tar.xz | |
Merge branch 'jc/maint-merge-autoedit' into maint
* jc/maint-merge-autoedit:
merge: backport GIT_MERGE_AUTOEDIT support
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 2bd92c4741..5afc99f650 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -8,9 +8,19 @@ 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 editor before committing successful merge to further - edit the default merge message. + edit the default merge message. The `--no-edit` option can be + used to accept the auto-generated message (this is generally + discouraged) when merging an annotated tag, in which case + `git merge` automatically spawns the editor so that the result + of the GPG verification of the tag can be seen. ++ +Older scripts may depend on the historical behaviour of not allowing the +user to edit the merge log message. They will see an editor opened when +they run `git merge` to merge an annotated tag. To make it easier to adjust +such scripts to the updated behaviour, the environment variable +`GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them. --ff:: When the merge resolves as a fast-forward, only update the branch |