Merge branch 'lt/fix-apply' into maint
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800)
* 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

Trivial merge