![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800) | ||
| commit | e1a0c8b1483b38d32d3870408e03a6c1b340aa15 | |
| tree | 7b803af235c934438e1133095c0ade9f4843db27 | tree | snapshot |
| parent | 9e7c73de0bcd410d12f897b19419dd35accd961e | commit | diff |
| parent | 12cbbdc40b50458b29b76af740ddc0ab1979b322 | commit | diff |
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
* 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