summaryrefslogtreecommitdiff
path: root/Documentation/git-write-tree.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-07-31 10:12:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-31 12:51:09 -0700
commit25c200a70078054b59331d50509481d00647dcbf (patch)
treec4ad01a04524bd3982febee086c18aa1722c26fa /Documentation/git-write-tree.txt
parentGit 2.18 (diff)
downloadtgif-25c200a70078054b59331d50509481d00647dcbf.tar.xz
t1015: demonstrate directory/file conflict recovery failures
Several "recovery" commands outright fail or do not fully recover when directory-file conflicts are present. This includes: * git read-tree --reset HEAD * git am --skip * git am --abort * git merge --abort * git reset --hard Add testcases documenting these shortcomings. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-write-tree.txt')
0 files changed, 0 insertions, 0 deletions