summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-25 12:00:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-29 13:19:21 -0700
commit34349dbff8632c353f083959881e38e1c853abf8 (patch)
tree966d6eed970ef37790808068af931dac05bb226e /contrib/examples/git-resolve.sh
parentmerge: clarify collect_parents() logic (diff)
downloadtgif-34349dbff8632c353f083959881e38e1c853abf8.tar.xz
merge: split reduce_parents() out of collect_parents()
The latter does two separate things: - Parse the list of commits on the command line, and formulate the list of commits to be merged (including the current HEAD); - Compute the list of parents to be recorded in the resulting merge commit. Split the latter into a separate helper function, so that we can later supply the list commits to be merged from a different source (namely, FETCH_HEAD). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions