mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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"
This commit is contained in:
commit
01a5774571
|
@ -99,10 +99,10 @@ must be given before the options meant for 'git fetch'.
|
|||
Options related to merging
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
include::merge-options.txt[]
|
||||
|
||||
:git-pull: 1
|
||||
|
||||
include::merge-options.txt[]
|
||||
|
||||
-r::
|
||||
--rebase[=false|true|preserve]::
|
||||
When true, rebase the current branch on top of the upstream
|
||||
|
|
|
@ -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
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue