Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

From: Mike Rappazzo <rappazzo@gmail.com>
Date: Nov 17, 2015, 15:36 UTC
Message-ID: <CANoM8SXrRmXPZQotQgJNNonJcb3rs5LM=JwOYoh4mX4nw2XB-g@mail.gmail.com>
In-Reply-To: <564B47AC.7070609@drmicha.warpmail.net>

On Tue, Nov 17, 2015 at 10:28 AM, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 12 quoted lines

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

Show 6 quoted lines

>
> If other people were interested they should or would have come up with
> comments, I think (as a general rule).
>
> Cheers,
> Michael