Merge branch 'lt/apply' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Feb 2006 05:55:08 +0000 (21:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Feb 2006 05:55:08 +0000 (21:55 -0800)
* lt/apply:
apply --whitespace fixes and enhancements.
The war on trailing whitespace
svnimport: Convert the svn:ignore property
svnimport: Convert executable flag
svnimport: Mention -r in usage summary
Make git diff-generation use a simpler spawn-like interface

Trivial merge