git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6f59058 6ea3b67)
Merge branch 'pt/am-abort-fix'
authorJunio C Hamano <redacted>
Wed, 24 Jun 2015 19:21:49 +0000 (12:21 -0700)
committerJunio C Hamano <redacted>
Wed, 24 Jun 2015 19:21:50 +0000 (12:21 -0700)
commitce5e33832ae3f7224fe39d6ade4764522197bacf
tree0230514d9edadd2eb41f0673e42c9ca54ccd664atree | snapshot
parent6f59058e490fa72c09faa974addfeeb2868dc648commit | diff
parent6ea3b67b4e3f4a09561a26ca42af1492b3b48c95commit | diff
Merge branch 'pt/am-abort-fix'

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
git-am.sh diff1 | diff2 | blob | history
t/t4151-am-abort.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT