]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 785bf20)
merge-ort: add some more explanations in collect_merge_info_callback()
authorElijah Newren <redacted>
Fri, 16 Jul 2021 05:22:32 +0000 (05:22 +0000)
committerJunio C Hamano <redacted>
Tue, 20 Jul 2021 21:47:39 +0000 (14:47 -0700)
commit528fc51b6d899e080a877f9420efcca86c98b35e
tree123e14ef8a85b3ac2e56b97637cc044eafae9236tree
parent785bf2088e54ed8a450edb5c7371286ff6405605commit | diff
merge-ort: add some more explanations in collect_merge_info_callback()

The previous patch possibly raises some questions about whether
additional cases in collect_merge_info_callback() can be handled early.
Add some explanations in the form of comments to help explain these
better.  While we're at it, add a few comments to denote what a few
boolean '0' or '1' values stand for.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-ort.c diff | blob | history
git clone https://git.99rst.org/PROJECT