| commit | c60b528225d2827fd43d4fe4b082e0188df7a280 | |
| author | Jean-Luc Herren <jlh@gmx.ch> | |
| Mon, 14 Jan 2008 21:47:42 +0000 (14 22:47 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jan 2008 21:52:27 +0000 (14 13:52 -0800) | ||
| tree | 333411a865b614104a562c23295e9363d4907170 | treesnapshot (tar.gz zip) |
| parent | cfc44a12fe94e4fa8433cc8e9d90db8d4edf89a7 | commitdiff |
Make default pre-commit hook less noisy
This hook thought to have found a conflict marker any time it saw
a 7-character combination of any of the characters '<>=' at the
beginning of a line, whereas it should only look for the *same*
character to appear repeatedly.
Also, restrict it to match exactly 7 times, to avoid matching the
underlining with '='-characters often used in documentation.
Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This hook thought to have found a conflict marker any time it saw
a 7-character combination of any of the characters '<>=' at the
beginning of a line, whereas it should only look for the *same*
character to appear repeatedly.
Also, restrict it to match exactly 7 times, to avoid matching the
underlining with '='-characters often used in documentation.
Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| templates/hooks--pre-commit | diffblobblamehistory |