]> git.ipfire.org Git - thirdparty/git.git/blobdiff - Documentation/git-pull.txt
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
[thirdparty/git.git] / Documentation / git-pull.txt
index 24ab07a3f8f80c56cbbd7feffc1b5bf65e137968..546f7b195ccbdf527824c1e7c288f423f012dabf 100644 (file)
@@ -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