diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:47 -0800 |
| commit | 01a5774571d9dcc545d81d5f6d9781df9591c4cf (patch) | |
| tree | d8b3b9dbb429194ac38e90c76424d4cbbbe60460 /Documentation/git-pull.txt | |
| parent | a74a682b55848007909fb210de45aa7b8260a49a (diff) | |
| parent | 08f19cfe9bff097e8828a289d2daf5f066e1af9d (diff) | |
| download | git-01a5774571d9dcc545d81d5f6d9781df9591c4cf.tar.gz git-01a5774571d9dcc545d81d5f6d9781df9591c4cf.tar.xz | |
Merge branch 'jc/maint-pull-docfix' into maint
The documentation to "git pull" hinted there is an "-m" option
because it incorrectly shared the documentation with "git merge".
* 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 6083aab87..200eb2226 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 |