diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-29 11:28:52 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-29 11:42:13 -0700 |
commit | e20ad449deefa7470386bf99e05fd8c67227f678 (patch) | |
tree | e7ba1ccf30798e4c3d5542b80a8dcee43520d703 /lisp/emacs-lisp | |
parent | bfc0f610bac3f97930941e9a66cbcd11cd382167 (diff) | |
download | emacs-e20ad449deefa7470386bf99e05fd8c67227f678.tar.gz emacs-e20ad449deefa7470386bf99e05fd8c67227f678.tar.bz2 emacs-e20ad449deefa7470386bf99e05fd8c67227f678.zip |
Allow bypassing of some checks when merging
* build-aux/git-hooks/pre-commit: Don't check merged-in changes.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions