Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 18, 2015, 09:56 UTC
- Message-ID
- <alpine.DEB.1.00.1511181052130.1686@s15462909.onlinehome-server.info>
- In-Reply-To
- <CANoM8SXrRmXPZQotQgJNNonJcb3rs5LM=JwOYoh4mX4nw2XB-g@mail.gmail.com>
Hi Mike,
On Tue, 17 Nov 2015, Mike Rappazzo wrote:
Show 23 quoted lines
> On Tue, Nov 17, 2015 at 10:28 AM, Michael J Gruber > <git@drmicha.warpmail.net> wrote: > > Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > > > > I still don't like the idea of having a new command just for the purpose > > of fast-forwarding local branches from specified upstreams. > > > > What's wrong with "git merge --ff-only" once you check them out? We have > > all the gory messages when you checkout a branch or use the git prompt > > or "branch -vv". And if you don't - how is forgetting to "ff-refs" > > better than forgetting to "merge --ff-only"? > > > > In short, I don't see a problem that this is solving, but maybe it's > > because we use local branches differently, I dunno. > > For me I use this command more as a post-fetch: > > git fetch --all --prune && git-ff-refs > > I imagine that the big difference is in the number of branches that I > maintain, and perhaps in the way that I use gitk to visualize them. I > would be happy to add another option to git-fetch for --ff-refs as an > alternative if that would feel better than a full-on builtin.
I would much prefer, say, `git fetch --all --prune --fast-forward-tracking-branches` (with maybe `-T` as short option for `--fast-forward-tracking-branches` and/or a shorter `--ff-tracking`) to a new builtin.
But yeah, I can see how it is convenient when you have to work with N tracking branches where N > 2.
Thanks, Dscho