![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Mar 2006 01:05:57 +0000 (17:05 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Mar 2006 01:05:57 +0000 (17:05 -0800) | ||
| commit | 145c9a60ad81477749a86acdf250d9e20742dcad | |
| tree | b82ee48c7fe16d9d712a64a4d87a3446b326c05b | tree | snapshot |
| parent | 6be65bbc958e8d7c57bc81ae7035119b8b1afbab | commit | diff |
| parent | 8c31cb822f387d7bc51b51cbacd08d62faed4faa | commit | diff |
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
* 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