]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ebc8cb 9f0aa6e)
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)
commite7cf4b257179b4683fa32beb51f949666d36fe9c
tree39bc239b04ed0175dbf223bf295273cf5c59c615tree | snapshot
parent7ebc8cbedd0e728d7ff00df63125de1a7adf5937commit | diff
parent9f0aa6e65447c719abe8fe739d9f1e40b7335af8commit | diff
Merge branch 'pt/am-foreign'

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
git-am.sh diff1 | diff2 | blob | history
t/t4150-am.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.