diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-04-25 19:00:14 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-04-29 20:19:21 (GMT) |
commit | 34349dbff8632c353f083959881e38e1c853abf8 (patch) | |
tree | 966d6eed970ef37790808068af931dac05bb226e /parse-options.c | |
parent | 0b10b8a3d53c7aaf42b8f14da1021ea59ea4e0ec (diff) | |
download | git-34349dbff8632c353f083959881e38e1c853abf8.zip git-34349dbff8632c353f083959881e38e1c853abf8.tar.gz git-34349dbff8632c353f083959881e38e1c853abf8.tar.bz2 |
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 'parse-options.c')
0 files changed, 0 insertions, 0 deletions