Skip to content

Commit

Permalink
man: git pull -r is a short for --rebase
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Miklos Vajna authored and Junio C Hamano committed Aug 17, 2012
1 parent 785ee49 commit d9aa361
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Documentation/git-pull.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d9aa361

Please sign in to comment.