Merge branch 'gb/am-foreign' into next
commit2d15aac85459f45b80128bb1cf7419da4650676a
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Jul 2009 02:46:59 +0000 (1 19:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Jul 2009 02:46:59 +0000 (1 19:46 -0700)
tree9bdfe8e1401158c8da02edd99d9bbb1990b9f09f
parentc5cb05c9ed08a998edfd4b5fc90f17401a546c7c
parent0cd29a0371838228e2c942058e8829f5d0d4a077
Merge branch 'gb/am-foreign' into next

* gb/am-foreign:
  git-am: refactor 'cleaning up and aborting'
  git-am foreign patch support: StGIT support
  git-am foreign patch support: autodetect some patch formats
  git-am foreign patch support: introduce patch_format
git-am.sh