Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'gb/maint-am-patch-format-error-message' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 23 Sep 2011 21:11:18 +0000
(14:11 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 23 Sep 2011 21:11:18 +0000
(14:11 -0700)
* gb/maint-am-patch-format-error-message:
am: format is in $patch_format, not parse_patch
1
2
git-am.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
e622f41
dff4b0e
)
diff --cc
git-am.sh
Simple merge