Re: [PATCH] Documentation: clarify commits affected by gitk --merge

From: Sitaram Chamarty <sitaramc@gmail.com>
Date: Feb 8, 2009, 01:15 UTC
Message-ID: <slrngoscgp.qdh.sitaramc@sitaramc.homelinux.net>
In-Reply-To: <7vtz75udj6.fsf@gitster.siamese.dyndns.org>

On 2009-02-07, Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

> Sitaram Chamarty <sitaramc@gmail.com> writes:
>
>>  	After an attempt to merge stops with conflicts, show the commits on
>>  	the history between two branches (i.e. the HEAD and the MERGE_HEAD)
>> -	that modify the conflicted files.
>> +	that modify the conflicted files and do not exist on all the heads
>> +	being merged.
>
> I do not understand what you are trying to add here, sorry.

It's basically the same thing as the explanation for --merge
in 'git help log':
   --merge
       After a failed merge, show refs that touch files
       having a conflict and donÂ´t exist on all heads to
       merge.

I'm pretty sure gitk is doing the same thing, so I thought the extra text should be added.

Regards,

Sitaram