threads / patch / 17602

patchDocumentation: clarify commits affected by gitk --merge

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

## tl;dr

3 messages between Feb 6, 2009 and Feb 8, 2009. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Sitaram Chamarty· Feb 6, 2009, 04:40 UTC · lore
Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
---

I remember being confused by this some weeks ago and someone clarified, so I thought I'd put it in.

 Documentation/gitk.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Show changes to Documentation/gitk.txt +2 −1
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 4673a75..bd005bc 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -47,7 +47,8 @@ frequently used options.
 
 	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.
 
 --argscmd=<command>::
 	Command to be run each time gitk has to determine the list of

-- 
1.6.1
Junio C Hamano· Feb 7, 2009, 21:45 UTC · re: Sitaram Chamarty · lore

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

Sitaram Chamarty <sitaramc@gmail.com> writes:
Show 5 quoted lines
>  	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.
Sitaram Chamarty· Feb 8, 2009, 01:15 UTC · re: Junio C Hamano · lore

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

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

← back to recent threads