Re: FYI: I've pushed a few maint changes, and...

[Jim Meyering]

Ralf Wildenhues <address@hidden> wrote:
> Jim Meyering <jim <at> meyering.net> writes:
>>
>> I mistakenly pushed a merge commit!

FWIW, I've adjusted the hook.

Hi Ralf ;-)

> I don't think that is a problem at all.  Actually, once I can find a decent

In general no, but pushing a useless merge like I did is
just adding clutter for no benefit.

> chunk of time again to work on GNU software, I intend to eventually change
> strategy for Automake and Libtool, to use 'git merge' much more often and
> rebase much less often, and consequently encourage feature branches.
>
> Look at how git itself is developed and how good it seems to be working out.
> It is not bad to have merges, it is only unknown country when looking across
> the border from CVS.  Merges are good; rebases simplify only stuff that hasn't
> seen the light of day yet.

I agree, but haven't felt motivated enough to switch yet.