Merge branch 'lt/apply' into next
commitf64c429ff75a1f53945b508f77e5f8f157a024c2
authorJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:35:00 +0000 (1 01:35 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:35:00 +0000 (1 01:35 -0800)
tree83f92420f9e76d6271366f65e79b1980b0a56870
parentdcf7e417c6ae8d6a3ec06967bf87aadd34dbeb72
parent8c31cb822f387d7bc51b51cbacd08d62faed4faa
Merge branch 'lt/apply' into next

* lt/apply:
  git-am: --whitespace=x option.