summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-history-graph.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-15 15:08:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-15 15:08:26 -0700
commite4095da40eef81f853bbeedf44d7f344bf682232 (patch)
tree456ce3ad1c5bc26992b02536fbe294f619b12cec /Documentation/technical/api-history-graph.txt
parentMerge branch 'jt/tag-following-with-proto-v2-fix' (diff)
parentmerge-recursive: preserve skip_worktree bit when necessary (diff)
downloadtgif-e4095da40eef81f853bbeedf44d7f344bf682232.tar.xz
Merge branch 'en/merge-recursive-skip-fix'
When the sparse checkout feature is in use, "git cherry-pick" and other mergy operations lost the skip_worktree bit when a path that is excluded from checkout requires content level merge, which is resolved as the same as the HEAD version, without materializing the merge result in the working tree, which made the path appear as deleted. This has been corrected by preserving the skip_worktree bit (and not materializing the file in the working tree). * en/merge-recursive-skip-fix: merge-recursive: preserve skip_worktree bit when necessary t3507: add a testcase showing failure with sparse checkout
Diffstat (limited to 'Documentation/technical/api-history-graph.txt')
0 files changed, 0 insertions, 0 deletions