![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Jul 2008 23:22:35 +0000 (16:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Jul 2008 23:22:35 +0000 (16:22 -0700) | ||
| commit | d4b76e15ea733002e364298a81889452b8bb2dfd | |
| tree | 5a8456715cf28f96e247cd2f3f61cf5922910b09 | tree | snapshot |
| parent | f7c3cf8106c09c714d46d39e8eef69838db8b339 | commit | diff |
| parent | ab20fda99236e38edf5d63f964b6b920b494aacb | commit | diff |
Merge branch 'jc/checkdiff'
* jc/checkdiff:
Fix t4017-diff-retval for white-space from wc
Update sample pre-commit hook to use "diff --check"
diff --check: detect leftover conflict markers
Teach "diff --check" about new blank lines at end
checkdiff: pass diff_options to the callback
check_and_emit_line(): rename and refactor
diff --check: explain why we do not care whether old side is binary
* jc/checkdiff:
Fix t4017-diff-retval for white-space from wc
Update sample pre-commit hook to use "diff --check"
diff --check: detect leftover conflict markers
Teach "diff --check" about new blank lines at end
checkdiff: pass diff_options to the callback
check_and_emit_line(): rename and refactor
diff --check: explain why we do not care whether old side is binary
| builtin-apply.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |