]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74301d6 c63d4b2)
Merge branch 'jc/am-3-fallback-regression-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Oct 2015 22:55:15 +0000 (15:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Oct 2015 22:55:15 +0000 (15:55 -0700)
commit9c53de7de12abfb9c13f5e7a82024680e3a90944
tree923fe252ae0c6d7cd64ebe1a30e531b95aaecaa4tree | snapshot
parent74301d6edeb0e081a4ef864057952b6a7ff2b4becommit | diff
parentc63d4b2fe86876cc210d8bf22bd84d617f7815b7commit | diff
Merge branch 'jc/am-3-fallback-regression-fix'

"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).

* jc/am-3-fallback-regression-fix:
  am -3: do not let failed merge from completing the error codepath
builtin/am.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.