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

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c97574323099bd5b831f2b1c12a54b8c5e06373b..546f7b195ccbdf527824c1e7c288f423f012dabf 100644 (file)
--- 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
@@ -218,7 +218,7 @@ $ git merge origin/next
 ------------------------------------------------
 
 
-If you tried a pull which resulted in a complex conflicts and
+If you tried a pull which resulted in complex conflicts and
 would want to start over, you can recover with 'git reset'.