From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 18 Jun 2015 13:05:17 GMT
Subject: Re: Visualizing merge conflicts after the fact (using kdiff3)
Message-ID: <126a1ed453d1624083c069b904dd25c0@www.dscho.org>
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