diff options
| author | Paul Eggert | 2020-01-01 01:08:16 +0000 |
|---|---|---|
| committer | Paul Eggert | 2020-01-01 01:08:16 +0000 |
| commit | c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch) | |
| tree | ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /build-aux/git-hooks | |
| parent | 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff) | |
| parent | 186152ba400b58d2d278c52d2e3d896decae767e (diff) | |
| download | emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip | |
Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3
4cd143aded Fix copyright years by hand
365e01cc9f Update copyright year to 2020
cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac...
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
Diffstat (limited to 'build-aux/git-hooks')
| -rwxr-xr-x | build-aux/git-hooks/commit-msg | 2 | ||||
| -rwxr-xr-x | build-aux/git-hooks/pre-commit | 2 | ||||
| -rwxr-xr-x | build-aux/git-hooks/prepare-commit-msg | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index 4ed261425d3..e84be4cbafe 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # Check the format of GNU Emacs change log entries. | 2 | # Check the format of GNU Emacs change log entries. |
| 3 | 3 | ||
| 4 | # Copyright 2014-2019 Free Software Foundation, Inc. | 4 | # Copyright 2014-2020 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit index e29a69f25b8..59fdaf58c1a 100755 --- a/build-aux/git-hooks/pre-commit +++ b/build-aux/git-hooks/pre-commit | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # Check file names in git commits for GNU Emacs. | 2 | # Check file names in git commits for GNU Emacs. |
| 3 | 3 | ||
| 4 | # Copyright 2014-2019 Free Software Foundation, Inc. | 4 | # Copyright 2014-2020 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/build-aux/git-hooks/prepare-commit-msg b/build-aux/git-hooks/prepare-commit-msg index 3562a802234..dbb1264b495 100755 --- a/build-aux/git-hooks/prepare-commit-msg +++ b/build-aux/git-hooks/prepare-commit-msg | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # Check the format of GNU Emacs change log entries. | 2 | # Check the format of GNU Emacs change log entries. |
| 3 | 3 | ||
| 4 | # Copyright 2019 Free Software Foundation, Inc. | 4 | # Copyright 2019-2020 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
| 7 | 7 | ||