builtin/merge.c: drop a parameter that is never used

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 6083aab87bd947c8528cbf347769b6621531b035..200eb22260069af7a9e2e248f0794a73e2cf4a9f 100644 (file)
--- 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