Merge branch 'jc/maint-pull-docfix'

* jc/maint-pull-docfix:
  Documentation: "git pull" does not have the "-m" option
  Documentation: exclude irrelevant options from "git pull"

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 6083aab87bd947c8528cbf347769b6621531b035..200eb22260069af7a9e2e248f0794a73e2cf4a9f 100644 (file)
--- 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 afba8d4f3b2dcc952310c270daf26e01f8b30800..e1343155fad7b2709d2f3700ea3d5b4c4d1a7a89 100644 (file)
--- 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