summaryrefslogtreecommitdiff
path: root/builtin/mktag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:39 (GMT)
commitced2321a8df8260e7d22e72e2bb5b8c6ab3f2180 (patch)
treed3a03df048d44183f43ae5506f5e5fe43c4154c5 /builtin/mktag.c
parentf5f76845961f4207b3dc8c186b2356f160276e45 (diff)
parentc63d4b2fe86876cc210d8bf22bd84d617f7815b7 (diff)
downloadgit-ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180.zip
git-ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180.tar.gz
git-ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180.tar.bz2
Merge branch 'jc/am-3-fallback-regression-fix' into maint
"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
Diffstat (limited to 'builtin/mktag.c')
0 files changed, 0 insertions, 0 deletions