git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6784574)
merge-ort: add a clear_internal_opts helper
authorElijah Newren <redacted>
Thu, 3 Dec 2020 15:59:41 +0000 (15:59 +0000)
committerJunio C Hamano <redacted>
Sun, 13 Dec 2020 22:21:03 +0000 (14:21 -0800)
commit101bc5bc2d73484d288a43fdcf1c00bc04b080e4
tree15ca7ff128c2b2748cd4599a2aa17e60850ba57ctree | snapshot
parent67845745c1ab7dcce72116fb58f99630d14e12cccommit | diff
merge-ort: add a clear_internal_opts helper

Move most of merge_finalize() into a new helper function,
clear_internal_opts().  This is a step to facilitate recursive merges,
as well as some future optimizations.

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