The first one is a clean-up of the code to parse command line options to "git merge-base". Options such as "--independent", "--is-ancestor" and "--octopus" are mutually exclusive and it is better expressed in terms of the recently introduced OPT_CMDMODE.
The second one implements the entire logic of the for loop we see in "git pull --rebase" directly using get_merge_bases_many() and postprocessing the result. Junio C Hamano (2): merge-base: use OPT_CMDMODE and clarify the command line parsing merge-base: "--reflog" mode finds fork point from reflog entries builtin/merge-base.c | 115 +++++++++++++++++++++++++++++++++++++++++++------- t/t6010-merge-base.sh | 27 ++++++++++++ 2 files changed, 126 insertions(+), 16 deletions(-) -- 1.8.4.1-799-g1c32b8d -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
