Andrew's git / gitweb.git / diff
?
Merge branch 'pt/am-foreign'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:12 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:12 +0000 (11:01 -0700)
Various enhancements around "git am" reading patches generated by
foreign SCM.

* pt/am-foreign:
am: teach mercurial patch parser how to read from stdin
am: use gmtime() to parse mercurial patch date
t4150: test applying StGit series
am: teach StGit patch parser how to read from stdin
t4150: test applying StGit patch

1  2 
git-am.sh patch | diff1 | diff2 | blob | history
t/t4150-am.sh patch | diff1 | diff2 | blob | history
diff --cc git-am.sh
Simple merge
diff --cc t/t4150-am.sh
Simple merge