summaryrefslogtreecommitdiff
path: root/t/t4013
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-09-04 14:31:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-04 14:31:38 -0700
commitca676b9bd354e846ac207e7879760719826517ce (patch)
treede33f48393a62396f73111655a41ae77f6be63c9 /t/t4013
parentMerge branch 'pw/rebase-i-author-script-fix' (diff)
parentam: avoid directory rename detection when calling recursive merge machinery (diff)
downloadtgif-ca676b9bd354e846ac207e7879760719826517ce.tar.xz
Merge branch 'en/directory-renames-nothanks'
Recent addition of "directory rename" heuristics to the merge-recursive backend makes the command susceptible to false positives and false negatives. In the context of "git am -3", which does not know about surrounding unmodified paths and thus cannot inform the merge machinery about the full trees involved, this risk is particularly severe. As such, the heuristic is disabled for "git am -3" to keep the machinery "more stupid but predictable". * en/directory-renames-nothanks: am: avoid directory rename detection when calling recursive merge machinery merge-recursive: add ability to turn off directory rename detection t3401: add another directory rename testcase for rebase and am
Diffstat (limited to 't/t4013')
0 files changed, 0 insertions, 0 deletions