Re: nicer frontend to get rebased tree?

["Mikael Magnusson" <mikachu@gmail.com>]

2008/8/22 Andi Kleen <andi@firstfloor.org>:
>
> A common use case for git here is to just use it as a code
> downloader without actually changing anything in the main branch.
>
> Especially in Linux kernel land there seem to be quite a few tree
> which are frequently rebased, which means that the usual "git pull -u"
> usually leads to conflicts even when one hasn't changed anything
> at all and just wants the latest state of that tree.
>
> I found this initially quite frustrating ("$@#!-git cannot
> even download new trees"), until I managed to
> script the necessary magic incarnations after some
> documentation study (which are quite a handfull to type manually).
>
> But I presume that's a reasonable common usage. Would it
> make sense to have some standard git sub command that does that?
> ("get latest state of remote branch, doing what it takes to get it")
> Or is there already one that I missed?

I'm pretty sure "git pull --rebase" will handle this case. You can set up
a config variable (per branch if you want) to make it the default so you
can just "git pull" again.

-- 
Mikael Magnusson