summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.6.0.6.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-12-03 15:59:44 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-13 14:38:47 -0800
commit04af1879b9313a83aea46791bad8963e14e7651e (patch)
tree40bff56e648c27eb8a7a84b5da5f98da53bf0e89 /Documentation/RelNotes/1.6.0.6.txt
parentmerge-ort: add a paths_to_free field to merge_options_internal (diff)
downloadtgif-04af1879b9313a83aea46791bad8963e14e7651e.tar.xz
merge-ort: add function grouping comments
Commit b658536f59 ("merge-ort: add some high-level algorithm structure", 2020-10-27) added high-level structure of the ort merge algorithm. As we have added more and more functions, that high-level structure has been slightly obscured. Since functions are still grouped according to this high-level structure, add comments denoting sections where all the functions are specifically tied to a piece of the high-level structure. This function groupings include a few sub-divisions of the original high-level structure, including some sub-divisions that are yet to be submitted. Each has (or will have) several functions all serving as helpers to one or two main functions for each section. As an added bonus, the comments will serve to provide a small textual separation between nearby sections and allow the next three patch series to be submitted independently and merge cleanly. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.6.0.6.txt')
0 files changed, 0 insertions, 0 deletions