Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix

* jc/maint-pull-docfix-for-409b8d82: Documentation: exclude irrelevant options from "git pull"
2014-01-14 10:47:09 -08:00 · 2014-01-14 10:47:09 -08:00 · 8be1d04a7e
commit 8be1d04a7e
parent 66fa1b2c35 d51a47552a
1 changed files with 2 additions and 2 deletions
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@ -97,10 +97,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::
 	Rebase the current branch on top of the upstream branch after