From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 04 Oct 2010 20:46:25 GMT
Subject: Re: Useful tracking branches and auto merging
Message-ID: <20101004204625.GH6466@burratino>
In-Reply-To: <AANLkTimq0sKUavKiXepDOz+DvrymuRAVUyAyV+FzbCBD@mail.gmail.com>

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}

> 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.