diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-05-22 10:18:51 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-05-22 10:18:51 -0700 |
| commit | 0d1ff4cbe232e9ee398dc30058495c29996c0b33 (patch) | |
| tree | a8a76410648760c7316c20fcde1c2809fecfec16 /autogen.sh | |
| parent | 5a024b72c50129cc429bc4b8b18b8c08f3f6b430 (diff) | |
| parent | 5d24af87c15d9baa9db96fe3c3200d5585d58c4e (diff) | |
| download | emacs-0d1ff4cbe232e9ee398dc30058495c29996c0b33.tar.gz emacs-0d1ff4cbe232e9ee398dc30058495c29996c0b33.tar.bz2 emacs-0d1ff4cbe232e9ee398dc30058495c29996c0b33.zip | |
Merge from origin/emacs-26
5d24af8 Remove from docs references to obsolete MULE variables
2bdc419 Do potentially destructive operations in prepare-commit-msg
# Conflicts:
# src/search.c
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh index d0f60dc68af..cff4a54be56 100755 --- a/autogen.sh +++ b/autogen.sh @@ -339,7 +339,7 @@ git_config diff.texinfo.xfuncname \ tailored_hooks= sample_hooks= -for hook in commit-msg pre-commit; do +for hook in commit-msg pre-commit prepare-commit-msg; do cmp -- build-aux/git-hooks/$hook "$hooks/$hook" >/dev/null 2>&1 || tailored_hooks="$tailored_hooks $hook" done |