summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-08-08 14:26:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-08 14:26:10 -0700
commit0bdaec1d3db90d69041531311fb34fa09639589b (patch)
tree6820529b8aecd2a0285cded426791b4f47335de9 /Documentation/config
parentMerge branch 'nd/switch-and-restore' (diff)
parentmerge-recursive: avoid directory rename detection in recursive case (diff)
downloadtgif-0bdaec1d3db90d69041531311fb34fa09639589b.tar.xz
Merge branch 'en/disable-dir-rename-in-recursive-merge'
"merge-recursive" hit a BUG() when building a virtual merge base detected a directory rename. * en/disable-dir-rename-in-recursive-merge: merge-recursive: avoid directory rename detection in recursive case
Diffstat (limited to 'Documentation/config')
0 files changed, 0 insertions, 0 deletions