summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-26 15:45:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-26 15:45:32 -0700
commitb7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764 (patch)
treeaf0c7b8de03f8144f2b020e3bd273cb3cb88893a /builtin/checkout.c
parentMerge branch 'po/po-readme' (diff)
parentam --skip/--abort: merge HEAD/ORIG_HEAD tree into index (diff)
downloadtgif-b7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764.tar.xz
Merge branch 'pt/am-builtin-abort-fix'
"git am" that was recently reimplemented in C had a performance regression in "git am --abort" that goes back to the version before an attempted (and failed) patch application. * pt/am-builtin-abort-fix: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
Diffstat (limited to 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions