From: E R <pc88mxer@gmail.com>
To: git@vger.kernel.org
Subject: finding the merge of two or more commits
Date: Thu, 29 Oct 2009 16:12:45 -0500 [thread overview]
Message-ID: <3a69fa7c0910291412l439f7f61vd3b55a77cd7e10b5@mail.gmail.com> (raw)
Hi,
Given two commits c1 and c2, is it possible to ask git if there are
any commits in the repository that were created by either a sequence
of commands like:
git checkout c1
git merge c2
or:
git checkout c2
git merge c1
with any required conflict resolution?
That is, I don't want to merge c1 and c2 myself, but I want to know if
someone else has merged c1 and c2, performed any conflict resolution
and committed the result.
Thanks,
ER
next reply other threads:[~2009-10-29 21:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-29 21:12 E R [this message]
2009-10-29 21:34 ` finding the merge of two or more commits Avery Pennarun
2009-10-30 18:04 ` Jeff King
2009-10-30 23:38 ` Jakub Narebski
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=3a69fa7c0910291412l439f7f61vd3b55a77cd7e10b5@mail.gmail.com \
--to=pc88mxer@gmail.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).