summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-14 18:47:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-14 18:47:09 (GMT)
commit8be1d04a7e9251380a5de80564284f0099774038 (patch)
treed1362aa098a86f7e031a6ddc0190e4c8d2736f3d /Documentation
parent66fa1b2c354f79ed48f5986ee700ccb2d167ccbf (diff)
parentd51a47552a913dcd4ba436d529d092e4f38a3182 (diff)
downloadgit-8be1d04a7e9251380a5de80564284f0099774038.zip
git-8be1d04a7e9251380a5de80564284f0099774038.tar.gz
git-8be1d04a7e9251380a5de80564284f0099774038.tar.bz2
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"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-pull.txt4
1 files changed, 2 insertions, 2 deletions
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 @@ 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