From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: Eric Raible <raible@nextest.com>, git@vger.kernel.org
Subject: Re: Visualizing merge conflicts after the fact (using kdiff3)
Date: Thu, 18 Jun 2015 15:05:17 +0200 [thread overview]
Message-ID: <126a1ed453d1624083c069b904dd25c0@www.dscho.org> (raw)
In-Reply-To: <5582B8EC.1060205@drmicha.warpmail.net>
Hi Micha,
On 2015-06-18 14:26, Michael J Gruber wrote:
> Johannes Schindelin venit, vidit, dixit 16.06.2015 11:43:
>
>> To list all the merge commits in the current branch, I would use the command-line:
>>
>> ```bash
>> git rev-list --author="My Colleague" --parents HEAD |
>> sed -n 's/ .* .*//p'
>> ```
>>
>> (i.e. listing all the commits with their parents, then filtering just the ones having more than one parent, which would include octopus merges if your history has them.)
>
> :)
>
> "--merges" (aka "--min-parents=2") is your friend here.
Learnt something!
Thanks,
Dscho
next prev parent reply other threads:[~2015-06-18 13:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 1:17 Visualizing merge conflicts after the fact (using kdiff3) Eric Raible
2015-06-16 9:43 ` Johannes Schindelin
2015-06-16 20:17 ` Eric Raible
2015-06-18 12:26 ` Michael J Gruber
2015-06-18 13:05 ` Johannes Schindelin [this message]
2015-06-18 15:57 ` Junio C Hamano
2015-06-19 8:34 ` Michael J Gruber
2015-06-19 16:19 ` Junio C Hamano
2015-07-06 19:38 ` Sebastian Schuberth
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=126a1ed453d1624083c069b904dd25c0@www.dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=raible@nextest.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 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).