diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 19:44:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 19:44:00 +0100 |
| commit | 6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2 (patch) | |
| tree | c3b55c2b461e1463bdd182533715bffb9e14c976 /Documentation/git-pull.txt | |
| parent | Merge branch 'jk/complete-merge-base' (diff) | |
| parent | Documentation: "git pull" does not have the "-m" option (diff) | |
| download | git-6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2.tar.xz git-6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2.zip | |
Merge branch 'jc/maint-pull-docfix'
* jc/maint-pull-docfix:
Documentation: "git pull" does not have the "-m" option
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 6083aab87b..200eb22260 100644 --- 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 |