Re: the "r" in "git pull -r"

[Andrew Hawryluk]

On Fri, Aug 7, 2009 at 8:45 PM, Patrick McCarty<address@hidden> wrote:
> On Fri, Aug 07, 2009 at 07:34:01PM -0700, Mark Polesky wrote:
>>
>> Regarding CG 1.2.2:
>> http://kainhofer.com/~lilypond/Documentation/contributor/Update-command.html
>>
>> What does "-r" do in "git pull -r"? I don't see "-r"
>> listed as an option here:
>> http://www.kernel.org/pub/software/scm/git/docs/git-pull.html
>
> It's undocumented, unfortunately.  :-)
>
> The equivalent long option (that *is* documented) is
>
>  git pull --rebase
>
> I think it would be nice to have an entire CG section devoted to
> explaining what "rebasing" means, but the "git rebase" man page
> provides a reasonably good explanation in the meantime.
>
> http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html

I'm currently reading 'Pro Git' by Scott Chacon
(http://progit.org/book/) and it's a very nice introduction to using
git for version control. It might make a nice link from the CG.

Andrew