diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:53:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:53:31 -0700 |
| commit | 88cec243a3bdfdd7dd93a6b6b0ce3bd84a731c84 (patch) | |
| tree | 22a09175187124962ad383bcdaad396ad8350a13 | |
| parent | 210106b4255b0ec314d160fef15bb38af119e4f3 (diff) | |
| parent | d9aa3610437e8cfab86fe3d1e3433400de15773d (diff) | |
| download | git-88cec243a3bdfdd7dd93a6b6b0ce3bd84a731c84.tar.gz | |
Merge branch 'mv/pull-r-for-rebase'
A minor documentation update.
* mv/pull-r-for-rebase:
man: git pull -r is a short for --rebase
| -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 defb544ed0..67fa5ee195 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 |