diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:39:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:39:10 -0700 |
| commit | d387868a7d29621e85e8c5c061d1f50586db74e5 (patch) | |
| tree | 0e94cb6cc9bd3615adf051107dd6ac071fa5b9c7 /Documentation | |
| parent | a46034819ecce6872bff099f3d75589f4d38c00c (diff) | |
| download | git-d387868a7d29621e85e8c5c061d1f50586db74e5.tar.gz git-d387868a7d29621e85e8c5c061d1f50586db74e5.tar.xz | |
merge: backport GIT_MERGE_AUTOEDIT support
Even though 1.7.9.x series does not open the editor by default
when merging in general, it does do so in one occassion: when
merging an annotated tag. And worse yet, there is no good way
for older scripts to decline this.
Backport the support for GIT_MERGE_AUTOEDIT environment variable
from 1.7.10 track to help those stuck on 1.7.9.x maintenance
track.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 2bd92c474..5afc99f65 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 |