From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Martin von Zweigbergk <martinvonz@gmail.com>,
John Keeping <john@keeping.me.uk>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 0/2] finding the fork point from reflog entries
Date: Thu, 24 Oct 2013 12:11:22 -0700 [thread overview]
Message-ID: <1382641884-14756-1-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <xmqqhac6o5hj.fsf@gitster.dls.corp.google.com>
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
next prev parent reply other threads:[~2013-10-24 19:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 18:53 [PATCH] rebase: use reflog to find common base with upstream John Keeping
2013-10-16 19:24 ` Jonathan Nieder
2013-10-16 19:44 ` John Keeping
2013-10-21 5:03 ` Martin von Zweigbergk
2013-10-21 11:24 ` John Keeping
2013-10-22 6:24 ` Martin von Zweigbergk
2013-10-24 19:04 ` Junio C Hamano
2013-10-24 19:11 ` Junio C Hamano [this message]
2013-10-24 19:11 ` [PATCH 1/2] merge-base: use OPT_CMDMODE and clarify the command line parsing Junio C Hamano
2013-10-24 19:11 ` [PATCH 2/2] merge-base: "--reflog" mode finds fork point from reflog entries Junio C Hamano
2013-10-24 21:01 ` Eric Sunshine
2013-10-24 21:26 ` Junio C Hamano
2013-10-24 21:43 ` Eric Sunshine
2013-10-24 22:13 ` Junio C Hamano
2013-10-24 22:21 ` [PATCH v2 " Junio C Hamano
2013-10-25 7:12 ` Johannes Sixt
2013-10-25 8:09 ` John Keeping
2013-10-25 8:17 ` Johannes Sixt
2013-10-25 16:53 ` Junio C Hamano
2013-10-25 21:38 ` [PATCH v3 2/2] merge-base: teach "--fork-point" mode Junio C Hamano
2013-10-25 21:56 ` Eric Sunshine
2013-10-26 5:15 ` Martin von Zweigbergk
2013-10-28 14:47 ` Junio C Hamano
2013-10-26 9:00 ` John Keeping
2013-10-28 19:13 ` Junio C Hamano
2013-10-29 8:51 ` John Keeping
2013-10-29 20:11 ` Junio C Hamano
2013-10-24 20:54 ` [PATCH 0/2] finding the fork point from reflog entries John Keeping
2013-10-24 21:20 ` Junio C Hamano
2013-10-24 21:31 ` John Keeping
2013-10-24 21:40 ` John Keeping
2013-10-24 21:50 ` John Keeping
2013-10-25 2:46 ` Junio C Hamano
2013-10-22 5:40 ` [PATCH] rebase: use reflog to find common base with upstream Martin von Zweigbergk
2013-10-24 20:26 ` John Keeping
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382641884-14756-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=jrnieder@gmail.com \
--cc=martinvonz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.