[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f62e53c 0ba17dd)
Merge branch 'jc/am-3-show-corrupted-patch' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jun 2010 23:21:23 +0000 (16:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jun 2010 23:21:23 +0000 (16:21 -0700)
* jc/am-3-show-corrupted-patch:
  am -3: recover the diagnostic messages for corrupt patches

1  2 
git-am.sh patch | diff1 | diff2 | blob | history

diff --cc git-am.sh
Simple merge
Git - the stupid content tracker