development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-pull-docfix' into maint

Browse source 
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:
Junio C Hamano 2014-02-05 14:03:47 -08:00
parent a74a682b55 08f19cfe9b
commit 01a5774571
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/git-pull.txt
View file

@ -99,10 +99,10 @@ must be given before the options meant for 'git fetch'.
Options related to merging Options related to merging
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
include::merge-options.txt[]
:git-pull: 1 :git-pull: 1
include::merge-options.txt[]
-r:: -r::
--rebase[=false|true|preserve]:: --rebase[=false|true|preserve]::
When true, rebase the current branch on top of the upstream When true, rebase the current branch on top of the upstream

9
Documentation/merge-options.txt
View file

@ -14,9 +14,12 @@ inspect and further tweak the merge result before committing.
further edit the auto-generated merge message, so that the user further edit the auto-generated merge message, so that the user
can explain and justify the merge. The `--no-edit` option can be can explain and justify the merge. The `--no-edit` option can be
used to accept the auto-generated message (this is generally used to accept the auto-generated message (this is generally
discouraged). The `--edit` (or `-e`) option is still useful if you are discouraged).
giving a draft message with the `-m` option from the command line ifndef::git-pull[]
and want to edit it in the editor. 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 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 user to edit the merge log message. They will see an editor opened when