Merge branch 'lt/apply' into next
commit0a26233859572f84a2c6e8648565af7e7514caac
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Feb 2006 05:55:08 +0000 (26 21:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Feb 2006 05:55:08 +0000 (26 21:55 -0800)
treeb0c48f472cf86f9cf4809b82bd247ffd722b97a0
parentef556367c22b96e03bf13b3c9b4f5072a572fbc0
parentb5767dd6605364002a96a9d039cd1f010707b4f6
Merge branch 'lt/apply' into next

* 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