Merge branch 'gb/am-foreign'
commit7557b3431065bfdaaaa8fa3cab5a67a82fae7348
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2009 16:38:33 +0000 (6 09:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2009 16:38:33 +0000 (6 09:38 -0700)
tree856c3bb484b72676e7e0982ba2f7932c1d03bf2b
parente5266920660ba61985ea6ef30da0d77197992075
parent0cd29a0371838228e2c942058e8829f5d0d4a077
Merge branch 'gb/am-foreign'

* 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