[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Understanding a recent commit in emacs-25 branch [ed19f2]
From: |
Stefan Monnier |
Subject: |
Re: Understanding a recent commit in emacs-25 branch [ed19f2] |
Date: |
Sun, 03 Apr 2016 10:18:14 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) |
>> 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.
Stefan
- Understanding a recent commit in emacs-25 branch [ed19f2], Kaushal Modi, 2016/04/01
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Kaushal Modi, 2016/04/01
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Paul Eggert, 2016/04/01
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Alan Mackenzie, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Achim Gratz, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2],
Stefan Monnier <=
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Óscar Fuentes, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Achim Gratz, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Andreas Schwab, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Eli Zaretskii, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Paul Eggert, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Andreas Schwab, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], John Wiegley, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Ingo Lohmar, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Alan Mackenzie, 2016/04/03