Re: [Qemu-devel] Re: updating git tree

[Jan Kiszka]

Kevin Wolf wrote:
> Jan Kiszka schrieb:
>> Christoph Egger wrote:
>>> On Tuesday 28 April 2009 08:54:56 Laurent Desnogues wrote:
>>>> On Tue, Apr 28, 2009 at 8:50 AM, C.W. Betts <address@hidden> wrote:
>>>>> I'm feeling lazy and I don't want to look at all the e-mails.  How do you
>>>>> update your git tree?
>>>> Once you've cloned it (aka checkout), you update your tree using git pull
>>>> (aka update).
>>> Unlike 'svn update', a 'git pull' doesn't automatically merge local changes.
>>> git fails instead. git is missing this 'automatic merge on pull' feature.
>>> If you have local changes, you must do
>>>
>>> git stash ; git pull ; git stash pop
>>>
>>> Christoph
>>>
>>> P.S.: With mercurial you do 'hg pull -u' and local changes are automatically
>>> merged.
>> If you have non-trivial changes pending, probably in multiple commits, I
>> can only recommend using stgit (or guilt) to compensate the missing
>> patch queue feature of git. It allows you to easily navigate back and
>> forth in your patch queues before finally posting them.
> 
> I haven't used these yet. Is there a real benefit compared to using a
> normal git branch and rebase -i? Maybe I should try them if so.

I'm not only talking about rebasing, also about working within your
patch queue, editing patches in their middle, splitting it up,
reordering it etc. There are surely ways to do this with native git
(stgit is just a front-end and uses normal git), but that's not done
with two or three git commands.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux