Re: Useful tracking branches and auto merging

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Oct 4, 2010, 20:56 UTC
Message-ID: <AANLkTikkXdDepdeOY4MZvgfCEgX69Tx6d0-QS-g3bWK-@mail.gmail.com>
In-Reply-To: <20101004204625.GH6466@burratino>

On Mon, Oct 4, 2010 at 11:46 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 9 quoted lines

> Felipe Contreras wrote:
>>  Your branch is behind 'origin/master' by 17 commits, and can be fast-forwarded.
>>
>> This message doesn't tell me _how_ I can 'fast-forward', I do 'git
>> merge origin/master' but if git already knows 'master' is tracking
>> 'origin/master' why should I specify that? Perhaps 'git merge
>> --tracking'.
>
> git merge @{u}

Interesting, I don't find anything like that in the documentation. Moreover, wouldn't it make sense to make 'git merge' = 'git merge @{u}'?

Show 7 quoted lines

>> But, while we are on that, why not automatically merge the tracking
>> branches?
>
> Maybe 'git pull --all' could be taught to eventually do this?  That
> would be incompatible with its current behavior of fetching everything
> and merging some random branch, but I don't think anyone is relying
> on that.

Maybe, I feel 'git pull' is for single branches or repos, whereas 'git remote update' is pretty clear it's for all the repos, so if some merging is to be done for all the repos, it should be some form of 'git remote', no?

-- 
Felipe Contreras