From: Junio C Hamano <junkio@cox.net>
Date: Thu, 2 Mar 2006 01:06:12 +0000 (-0800)
Subject: Merge branch 'lt/fix-apply' into maint
X-Git-Tag: v1.2.4^0
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e1a0c8b1483b38d32d3870408e03a6c1b340aa15;p=git.git

Merge branch 'lt/fix-apply' into maint

* lt/fix-apply:
  git-am: --whitespace=x option.
  git-apply: war on whitespace -- finishing touches.
  git-apply --whitespace=nowarn
  apply --whitespace: configuration option.
  apply: squelch excessive errors and --whitespace=error-all
  apply --whitespace fixes and enhancements.
  The war on trailing whitespace
---

e1a0c8b1483b38d32d3870408e03a6c1b340aa15