Sebastian Schuberth <sschuberth@xxxxxxxxx> wrote: > I'd like our pre-commit hook to skip some checks if the commit that's > about to be made is a merge commit. What's the most reliable way to > detect a merge commit from within a pre-commit hook script? Currently, > the only way I see is to check whether .git/MERGE_MSG exists, but I'd > feel safer to check whether the commit is going to have more than one > parent or so. Is that possible / a better detection? I haven't found a better way either, so this is the method we use too. The problem is that it fails when you are amending a merge commit; so the output of our pre-commit hook advises the user to manually do a "git commit --no-verify" in that case. -- Stefan Haller Berlin, Germany http://www.haller-berlin.de/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html