Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make)

[Noam Postavsky]

On Sat, Apr 29, 2017 at 4:04 PM, Eli Zaretskii <address@hidden> wrote:
>>
>> My intuition is that getting a commit hook failure from the commit
>> being cherry picked will be less confusing than getting hook failures
>> from one of the  many commits being merged from a branch, so I don't
>> think it's worth updating the hook to avoid this case.
>
> I don't think I agree.  In fact, I think many users will not even
> realize that cherry-pick merges, and will be surprised.

Hmm, I'm not sure I entirely understand what you're getting at. What
exactly do you mean by "merges" in this context?