From: Junio C Hamano <junkio@cox.net>
Date: Thu, 2 Mar 2006 01:05:57 +0000 (-0800)
Subject: Merge branch 'lt/apply'
X-Git-Tag: v1.3.0-rc1~107
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=145c9a60ad81477749a86acdf250d9e20742dcad;p=git.git

Merge branch 'lt/apply'

* lt/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
---

145c9a60ad81477749a86acdf250d9e20742dcad