summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-05 22:03:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-05 22:03:47 (GMT)
commit01a5774571d9dcc545d81d5f6d9781df9591c4cf (patch)
treed8b3b9dbb429194ac38e90c76424d4cbbbe60460
parenta74a682b55848007909fb210de45aa7b8260a49a (diff)
parent08f19cfe9bff097e8828a289d2daf5f066e1af9d (diff)
downloadgit-01a5774571d9dcc545d81d5f6d9781df9591c4cf.zip
git-01a5774571d9dcc545d81d5f6d9781df9591c4cf.tar.gz
git-01a5774571d9dcc545d81d5f6d9781df9591c4cf.tar.bz2
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"
-rw-r--r--Documentation/git-pull.txt4
-rw-r--r--Documentation/merge-options.txt9
2 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 6083aab..200eb22 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -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
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index afba8d4..e134315 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