projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9e7c73d 12cbbdc)
Merge branch 'lt/fix-apply' into maint v1.2.4
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800)
commite1a0c8b1483b38d32d3870408e03a6c1b340aa15
tree7b803af235c934438e1133095c0ade9f4843db27tree | snapshot
parent9e7c73de0bcd410d12f897b19419dd35accd961ecommit | diff
parent12cbbdc40b50458b29b76af740ddc0ab1979b322commit | 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
The core git plumbing