diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:05:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:05:47 -0700 |
| commit | 1103996ea4680329baf3853984499b623c6da839 (patch) | |
| tree | 4d4dd4ffc2301150421655c41fdda8baab2a10c4 /Documentation | |
| parent | bdb30339f6dd122f27d4a6ffaeaa45b1c7e736e3 (diff) | |
| parent | d9aa3610437e8cfab86fe3d1e3433400de15773d (diff) | |
| download | git-1103996ea4680329baf3853984499b623c6da839.tar.gz git-1103996ea4680329baf3853984499b623c6da839.tar.xz | |
Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11
A minor documentation update.
* mv/pull-r-for-rebase:
man: git pull -r is a short for --rebase
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index defb544ed..67fa5ee19 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -101,6 +101,7 @@ include::merge-options.txt[] :git-pull: 1 +-r:: --rebase:: Rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to |