diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-08-16 11:50:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-17 00:26:52 -0700 |
| commit | d9aa3610437e8cfab86fe3d1e3433400de15773d (patch) | |
| tree | 032247e7dc548244503f4b6dab8b5d5eb29c3a00 | |
| parent | 785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 (diff) | |
| download | git-d9aa3610437e8cfab86fe3d1e3433400de15773d.tar.gz git-d9aa3610437e8cfab86fe3d1e3433400de15773d.tar.xz | |
man: git pull -r is a short for --rebase
Letting the "--rebase" option squat on the short-and-sweet single
letter option "-r" was an unintended accident and was not even
documented, but the short option seems to be already used in the
wild. Let's document it so that other options that begin with "r"
would not be tempted to steal it.
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 |