aboutsummaryrefslogtreecommitdiffstats
path: root/commit-reach.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-04-15 14:11:30 -0700
committerJunio C Hamano <gitster@pobox.com>2024-04-15 14:11:44 -0700
commit548fe35913139eba2981be718f7b4dff7d0412d5 (patch)
treeffb093bf8a2c745e06b61cc0825776f700b5f539 /commit-reach.c
parentMerge branch 'jc/t2104-style-fixes' (diff)
downloadgit-548fe35913139eba2981be718f7b4dff7d0412d5.tar.gz
git-548fe35913139eba2981be718f7b4dff7d0412d5.zip
The ninteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-reach.c')
0 files changed, 0 insertions, 0 deletions
/+6 As the band-aid to merge-recursive seems to regress complex merges in an unpleasant way. The merge-recursive implementation needs to be rewritten in such a way that it resolves renames and D/F conflicts entirely in-core and not to touch working tree at all while doing so. But in the meantime, this reverts commit ac9666f84 that merged the topic in its entirety. 2011-05-19Git 1.7.5.2v1.7.5.2Junio C Hamano2-2/+3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-19Makefile: sort TEST_PROGRAMS listJeff King1-2/+2 We usually keep these lists in sorted order, but the last few entries were just tacked on the end. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>