diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
| commit | c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1 (patch) | |
| tree | 1e2fc163814f8a67de8629f2a39db92f2160c39b /merge-options.txt | |
| parent | fd98be8ac969289726bc1df7bab75d2e02ddbaa7 (diff) | |
| download | git-htmldocs-c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1.tar.gz | |
Autogenerated HTML docs for v1.9-rc1
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/merge-options.txt b/merge-options.txt index afba8d4f3..e1343155f 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -14,9 +14,12 @@ inspect and further tweak the merge result before committing. 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` (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. + discouraged). +ifndef::git-pull[] +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. +endif::git-pull[] + 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 |