diff options
author | Jean-Luc Herren <jlh@gmx.ch> | 2008-01-14 22:47:42 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-01-14 13:52:27 -0800 |
commit | c60b528225d2827fd43d4fe4b082e0188df7a280 (patch) | |
tree | 333411a865b614104a562c23295e9363d4907170 /diff.c | |
parent | cfc44a12fe94e4fa8433cc8e9d90db8d4edf89a7 (diff) | |
download | git-c60b528225d2827fd43d4fe4b082e0188df7a280.tar.gz git-c60b528225d2827fd43d4fe4b082e0188df7a280.tar.xz |
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>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions