]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 877f23c) | patch
diff --check: detect leftover conflict markers
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Jun 2008 22:37:21 +0000 (15:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2008 05:07:54 +0000 (22:07 -0700)
commit049540435fa5f7f583b8f5af257322b17eac7375
tree501fceeeb949f29edeac20f6182635ca4323adaatree | snapshot
parent877f23ccb88227203f2576abdfb5d1c15925fcb3commit | diff
diff --check: detect leftover conflict markers

This teaches "diff --check" to detect and complain if the change
adds lines that look like leftover conflict markers.

We should be able to remove the old Perl script used in the sample
pre-commit hook and modernize the script with this facility.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c diff | blob | blame | history
t/t4017-diff-retval.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.