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

…ocfix * jc/maint-pull-docfix-for-409b8d82: Documentation: exclude irrelevant options from "git pull"
git-mirror · Jan 14, 2014 · 8be1d04 · 8be1d04
2 parents 66fa1b2 + d51a475
commit 8be1d04
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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