diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-14 19:47:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-14 19:47:09 +0100 |
| commit | 8be1d04a7e9251380a5de80564284f0099774038 (patch) | |
| tree | d1362aa098a86f7e031a6ddc0190e4c8d2736f3d /Documentation/git-pull.txt | |
| parent | Documentation/merge-options.txt: restore `-e` option (diff) | |
| parent | Documentation: exclude irrelevant options from "git pull" (diff) | |
| download | git-8be1d04a7e9251380a5de80564284f0099774038.tar.xz git-8be1d04a7e9251380a5de80564284f0099774038.zip | |
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/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 24ab07a3f8..546f7b195c 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 |