diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-01 17:36:37 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-01 17:36:37 -0800 |
commit | 795a5a34d9b6379bc413201d8b038b0d1aac2391 (patch) | |
tree | c829dcae052f531fbb014069fa6fea05f2571cd0 /merge-options.txt | |
parent | 56bcc4f4cfe44a679201097e7d9a72695ad7566c (diff) | |
download | git-htmldocs-795a5a34d9b6379bc413201d8b038b0d1aac2391.tar.gz |
Autogenerated HTML docs for v1.7.9-111-gf3fb0
Diffstat (limited to 'merge-options.txt')
-rw-r--r-- | merge-options.txt | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/merge-options.txt b/merge-options.txt index 1a5c12e31..f2f1d0f51 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -8,9 +8,20 @@ failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing. --edit:: --e:: - Invoke editor before committing successful merge to further - edit the default merge message. +--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 + giving a draft message with the `-m` option from the command line + and want to edit it in the editor. ++ +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 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:: --no-ff:: |