mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 20:36:33 +02:00
Code

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"
This commit is contained in:
Junio C Hamano 2014-01-14 10:47:09 -08:00
parent 66fa1b2c35 d51a47552a
commit 8be1d04a7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-pull.txt
View 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