From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Feb 2006 05:55:08 +0000 (-0800)
Subject: Merge branch 'lt/apply' into next
X-Git-Tag: v1.3.0-rc1~54^2~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a26233859572f84a2c6e8648565af7e7514caac;p=git.git

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
---

0a26233859572f84a2c6e8648565af7e7514caac