]> git.eshelyaron.com Git - emacs.git/commit
; Let pre-commit git hook check merged in changes (Bug#29197)
authorNoam Postavsky <npostavs@gmail.com>
Thu, 15 Feb 2018 00:58:07 +0000 (19:58 -0500)
committerNoam Postavsky <npostavs@gmail.com>
Tue, 28 Aug 2018 12:04:17 +0000 (08:04 -0400)
commitfca935e4abe817130abb2676ec2f37b73e4f45f4
tree27366dd88dc82ae9e02d5164ed02da3302539f63
parentfe06fcc5955731b1373aa74a586da04f5c2c11f7
; Let pre-commit git hook check merged in changes (Bug#29197)

* build-aux/git-hooks/pre-commit: If GIT_MERGE_CHECK_OTHER is 'true',
check changes against the merge target, rather than the current
branch.  Include file name when giving error message about
non-standard characters.
build-aux/git-hooks/pre-commit