diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
| commit | c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1 (patch) | |
| tree | 1e2fc163814f8a67de8629f2a39db92f2160c39b /git-pull.txt | |
| parent | fd98be8ac969289726bc1df7bab75d2e02ddbaa7 (diff) | |
| download | git-htmldocs-c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1.tar.gz | |
Autogenerated HTML docs for v1.9-rc1
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.txt b/git-pull.txt index 6083aab87..200eb2226 100644 --- a/git-pull.txt +++ b/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 |