Re: Understanding a recent commit in emacs-25 branch [ed19f2]

[Óscar Fuentes]

Stefan Monnier <address@hidden> writes:

>>> It was git that prepared the merge, not me.
>> Blaming the tools?
>
> Yes.  Git makes it all too easy here to create such annoying merge
> commits, and if you don't have enough experience with Git you won't
> even notice it.
>
> But even if you do notice it, it can be pretty challenging to fix it
> after the fact, or to avoid it before the fact.
>
> It's not just that Git is a sharp tool here: in this instance, it makes
> it easy to do the wrong thing, and hard to do the right thing.

I know I sound like a broken record, but if the UI of git is not
adequate for you then try other UI. I'll suggest Magit, which makes all
those operations trivial to work with. It requires Emacs to run, which
is a fat dependency, but it is worth the disk space IMHO.

The downside is that you might have much less problems with git on the
future, and hence your view about that tool could change a bit and
complain less about it on the ml. You must ponder what causes more
pleasure to you: disparage git or get the job done.

:-)