From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Jul 2008 23:22:35 +0000 (-0700)
Subject: Merge branch 'jc/checkdiff'
X-Git-Tag: v1.6.0-rc0~175
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d4b76e15ea733002e364298a81889452b8bb2dfd;p=git.git

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
---

d4b76e15ea733002e364298a81889452b8bb2dfd