From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2014 18:44:00 +0000 (-0800)
Subject: Merge branch 'jc/maint-pull-docfix'
X-Git-Tag: v1.9-rc1~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2?hp=ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60

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 6083aab87b..200eb22260 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 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