{"thread":{"id":"17602","subject":"[PATCH] Documentation: clarify commits affected by gitk --merge","startedAt":"2009-02-06T04:40:53Z","lastAt":"2009-02-08T01:15:05Z","messageCount":3,"participants":["Sitaram Chamarty","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"103425","messageId":"20090206044053.GA6831@atcmail.atc.tcs.com","threadId":"17602","inReplyTo":null,"subject":"[PATCH] Documentation: clarify commits affected by gitk --merge","fromName":"Sitaram Chamarty","fromEmail":"sitaramc@gmail.com","sentAt":"2009-02-06T04:40:53Z","receivedAt":"2009-02-06T04:40:53Z","isPatch":true,"sender":{"key":"sitaramc@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43316?v=4"},"body":"Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>\n---\n\nI remember being confused by this some weeks ago and someone clarified, so I\nthought I'd put it in.\n\n Documentation/gitk.txt |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\nindex 4673a75..bd005bc 100644\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -47,7 +47,8 @@ frequently used options.\n \n \tAfter an attempt to merge stops with conflicts, show the commits on\n \tthe history between two branches (i.e. the HEAD and the MERGE_HEAD)\n-\tthat modify the conflicted files.\n+\tthat modify the conflicted files and do not exist on all the heads\n+\tbeing merged.\n \n --argscmd=<command>::\n \tCommand to be run each time gitk has to determine the list of\n-- \n1.6.1\n"},{"id":"103653","messageId":"7vtz75udj6.fsf@gitster.siamese.dyndns.org","threadId":"17602","inReplyTo":"20090206044053.GA6831@atcmail.atc.tcs.com","subject":"Re: [PATCH] Documentation: clarify commits affected by gitk --merge","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-07T21:45:33Z","receivedAt":"2009-02-07T21:45:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sitaram Chamarty <sitaramc@gmail.com> writes:\n\n>  \tAfter an attempt to merge stops with conflicts, show the commits on\n>  \tthe history between two branches (i.e. the HEAD and the MERGE_HEAD)\n> -\tthat modify the conflicted files.\n> +\tthat modify the conflicted files and do not exist on all the heads\n> +\tbeing merged.\n\nI do not understand what you are trying to add here, sorry.\n"},{"id":"103676","messageId":"slrngoscgp.qdh.sitaramc@sitaramc.homelinux.net","threadId":"17602","inReplyTo":"7vtz75udj6.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Documentation: clarify commits affected by gitk --merge","fromName":"Sitaram Chamarty","fromEmail":"sitaramc@gmail.com","sentAt":"2009-02-08T01:15:05Z","receivedAt":"2009-02-08T01:15:05Z","isPatch":true,"sender":{"key":"sitaramc@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43316?v=4"},"body":"On 2009-02-07, Junio C Hamano <gitster@pobox.com> wrote:\n> Sitaram Chamarty <sitaramc@gmail.com> writes:\n>\n>>  \tAfter an attempt to merge stops with conflicts, show the commits on\n>>  \tthe history between two branches (i.e. the HEAD and the MERGE_HEAD)\n>> -\tthat modify the conflicted files.\n>> +\tthat modify the conflicted files and do not exist on all the heads\n>> +\tbeing merged.\n>\n> I do not understand what you are trying to add here, sorry.\n\nIt's basically the same thing as the explanation for --merge\nin 'git help log':\n   --merge\n       After a failed merge, show refs that touch files\n       having a conflict and don´t exist on all heads to\n       merge.\n\nI'm pretty sure gitk is doing the same thing, so I thought\nthe extra text should be added.\n\nRegards,\n\nSitaram\n"}]}