diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:47 -0800 |
| commit | 01a5774571d9dcc545d81d5f6d9781df9591c4cf (patch) | |
| tree | d8b3b9dbb429194ac38e90c76424d4cbbbe60460 /Documentation/merge-options.txt | |
| parent | Merge branch 'ow/stash-with-ifs' into maint (diff) | |
| parent | Documentation: "git pull" does not have the "-m" option (diff) | |
| download | tgif-01a5774571d9dcc545d81d5f6d9781df9591c4cf.tar.xz | |
Merge branch 'jc/maint-pull-docfix' into maint
The documentation to "git pull" hinted there is an "-m" option
because it incorrectly shared the documentation with "git merge".
* jc/maint-pull-docfix:
Documentation: "git pull" does not have the "-m" option
Documentation: exclude irrelevant options from "git pull"
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index afba8d4f3b..e1343155fa 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/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 |