summaryrefslogtreecommitdiff
path: root/Documentation/git-name-rev.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-12-03 15:59:43 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-13 14:38:47 -0800
commit43c1dccb91c0d56b0b00f1b452a1a7204c4242da (patch)
treed4a9d8bd522590c38b932a9b7fd7073e28aa01b1 /Documentation/git-name-rev.txt
parentmerge-ort: add a path_conflict field to merge_options_internal (diff)
downloadtgif-43c1dccb91c0d56b0b00f1b452a1a7204c4242da.tar.xz
merge-ort: add a paths_to_free field to merge_options_internal
This field will be used in future patches to allow removal of paths from opt->priv->paths. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-name-rev.txt')
0 files changed, 0 insertions, 0 deletions