From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 17:41:32 +0000 (-0700)
Subject: Merge branch 'pt/am-abort-fix' into maint
X-Git-Tag: v2.4.8~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c36e465aca712cea70cb9570a1e7136e5de36b76;p=thirdparty%2Fgit.git

Merge branch 'pt/am-abort-fix' into maint

Various fixes around "git am" that applies a patch to a history
that is not there yet.

* pt/am-abort-fix:
  am --abort: keep unrelated commits on unborn branch
  am --abort: support aborting to unborn branch
  am --abort: revert changes introduced by failed 3way merge
  am --skip: support skipping while on unborn branch
  am -3: support 3way merge on unborn branch
  am --skip: revert changes introduced by failed 3way merge
---

c36e465aca712cea70cb9570a1e7136e5de36b76