|
From: | Paul Eggert |
Subject: | Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) |
Date: | Sat, 29 Apr 2017 11:44:06 -0700 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 |
Noam Postavsky wrote:
Since git only runs the hooks on the merged changes when you pass --no-commit to 'git merge', defaulting to non-blind merge doesn't really work anyway.
Thanks for looking into this. I guess I'll have to rethink how I merge. In the meantime I installed the attached simpler patch, which doesn't bother with an environment variable and simply skips the checks in a two-way merge.
0001-Allow-bypassing-of-some-checks-when-merging.patch
Description: Text Data
[Prev in Thread] | Current Thread | [Next in Thread] |