| commit | e20ad449deefa7470386bf99e05fd8c67227f678 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Sat, 29 Apr 2017 18:28:52 +0000 (29 11:28 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Sat, 29 Apr 2017 18:42:13 +0000 (29 11:42 -0700) | ||
| tree | e7ba1ccf30798e4c3d5542b80a8dcee43520d703 | treesnapshot (tar.gz zip) |
| parent | bfc0f610bac3f97930941e9a66cbcd11cd382167 | commitdiff |
Allow bypassing of some checks when merging
* build-aux/git-hooks/pre-commit: Don't check merged-in changes.
* build-aux/git-hooks/pre-commit: Don't check merged-in changes.
| build-aux/git-hooks/pre-commit | diffblobblamehistory |