mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Merge remote-tracking branch 'origin/master' into feature/android
This commit is contained in:
commit
86b7ed619c
11 changed files with 106 additions and 78 deletions
|
|
@ -42,4 +42,4 @@ else
|
|||
fi
|
||||
|
||||
git rev-parse HEAD | $awk -v reason=post-commit \
|
||||
-f .git/hooks/commit-msg-files.awk
|
||||
-f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk
|
||||
|
|
|
|||
|
|
@ -83,4 +83,4 @@ $awk -v origin_name="$1" '
|
|||
# Print every SHA after oldref, up to (and including) newref.
|
||||
system("git rev-list --first-parent --reverse " oldref ".." newref)
|
||||
}
|
||||
' | $awk -v reason=pre-push -f .git/hooks/commit-msg-files.awk
|
||||
' | $awk -v reason=pre-push -f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue