Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/am-3-show-corrupted-patch'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 21 May 2010 11:02:18 +0000
(
04:02
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 21 May 2010 11:02:18 +0000
(
04:02
-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
raw
|
combined
(merge:
a660534
0ba17dd
)
diff --cc
git-am.sh
Simple merge