summaryrefslogtreecommitdiff
path: root/Documentation/git-credential-store.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-01-01 02:34:41 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-04 10:40:45 -0800
commit5a1a1e8ea9fdd4a575c711b91f176838ea502e44 (patch)
tree044e221c821562f97fcb52733815c108991c35f8 /Documentation/git-credential-store.txt
parentmerge-ort: handle directory/file conflicts that remain (diff)
downloadtgif-5a1a1e8ea9fdd4a575c711b91f176838ea502e44.tar.xz
merge-ort: implement unique_path() helper
Implement unique_path(), based on the one from merge-recursive.c. It is simplified, however, due to: (1) using strmaps, and (2) the fact that merge-ort lets the checkout codepath handle possible collisions with the working tree means that other code locations don't have to. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-credential-store.txt')
0 files changed, 0 insertions, 0 deletions