From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Dec 2007 05:42:53 +0000 (-0800)
Subject: Merge branch 'wc/diff'
X-Git-Tag: v1.5.4-rc1~53
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dfaf75b4698833d820e77e9f42ef93f3b6d3669d;p=git.git

Merge branch 'wc/diff'

* wc/diff:
  Test interaction between diff --check and --exit-code
  Use shorter error messages for whitespace problems
  Add tests for "git diff --check" with core.whitespace options
  Make "diff --check" output match "git apply"
  Unify whitespace checking
  diff --check: minor fixups
  "diff --check" should affect exit status
---

dfaf75b4698833d820e77e9f42ef93f3b6d3669d