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"
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 24ab07a..546f7b1 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -97,10 +97,10 @@
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
