{"thread":{"id":"13286","subject":"[PATCH] Documentation gitk: Describe what --merge does","startedAt":"2008-04-27T15:51:09Z","lastAt":"2008-04-28T20:58:35Z","messageCount":3,"participants":["Richard Quirk","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"75299","messageId":"1209311469-7561-1-git-send-email-richard.quirk@gmail.com","threadId":"13286","inReplyTo":null,"subject":"[PATCH] Documentation gitk: Describe what --merge does","fromName":"Richard Quirk","fromEmail":"richard.quirk@gmail.com","sentAt":"2008-04-27T15:51:09Z","receivedAt":"2008-04-27T15:51:09Z","isPatch":true,"sender":{"key":"richard.quirk@gmail.com","avatar":null},"body":"Signed-off-by: Richard Quirk <richard.quirk@gmail.com>\n---\n Documentation/gitk.txt |    5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\nindex ed3ba83..edd6547 100644\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -41,6 +41,11 @@ frequently used options.\n \n \tShow all branches.\n \n+--merge::\n+\n+\tShow the differences between HEAD and MERGE_HEAD for files with\n+\tconflicts after a merge.\n+\n <revs>::\n \n \tLimit the revisions to show. This can be either a single revision\n-- \n1.5.5.1.79.g57cf\n"},{"id":"75330","messageId":"7vlk2zf304.fsf@gitster.siamese.dyndns.org","threadId":"13286","inReplyTo":"1209311469-7561-1-git-send-email-richard.quirk@gmail.com","subject":"Re: [PATCH] Documentation gitk: Describe what --merge does","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-27T20:37:31Z","receivedAt":"2008-04-27T20:37:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Richard Quirk <richard.quirk@gmail.com> writes:\n\n> Signed-off-by: Richard Quirk <richard.quirk@gmail.com>\n> ---\n>  Documentation/gitk.txt |    5 +++++\n>  1 files changed, 5 insertions(+), 0 deletions(-)\n>\n> diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\n> index ed3ba83..edd6547 100644\n> --- a/Documentation/gitk.txt\n> +++ b/Documentation/gitk.txt\n> @@ -41,6 +41,11 @@ frequently used options.\n>  \n>  \tShow all branches.\n>  \n> +--merge::\n> +\n> +\tShow the differences between HEAD and MERGE_HEAD for files with\n> +\tconflicts after a merge.\n> +\n\nHmm. \"the differences\" is technically correct in that it shows the\ncommits on the diverged histories, but I suspect it would be more\nunderstandable if we used more explicit wording, like:\n\n\tAfter an attempt to merge stops with conflicts, show the commits\n\ton the history between two branches (i.e. the HEAD and the\n\tMERGE_HEAD) that modify the conflicted files.\n"},{"id":"75452","messageId":"1209416315-13925-1-git-send-email-richard.quirk@gmail.com","threadId":"13286","inReplyTo":"7vlk2zf304.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Documentation gitk: Describe what --merge does","fromName":"Richard Quirk","fromEmail":"richard.quirk@gmail.com","sentAt":"2008-04-28T20:58:35Z","receivedAt":"2008-04-28T20:58:35Z","isPatch":true,"sender":{"key":"richard.quirk@gmail.com","avatar":null},"body":"Signed-off-by: Richard Quirk <richard.quirk@gmail.com>\n---\n\nOn Sun, Apr 27, 2008 at 10:37 PM, Junio C Hamano <gitster@pobox.com> wrote:\n>  Hmm. \"the differences\" is technically correct in that it shows the\n>  commits on the diverged histories, but I suspect it would be more\n>  understandable if we used more explicit wording\n\nYes, and your explicit wording was much clearer.\n\nI'm not sure if resending this is strictly the Right Thing given that the\nwords are actually yours. But here's the updated patch so --merge might get\nsome documentation, just in case.\n\n Documentation/gitk.txt |    6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\nindex ed3ba83..c40f997 100644\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -41,6 +41,12 @@ frequently used options.\n \n \tShow all branches.\n \n+--merge::\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+\n <revs>::\n \n \tLimit the revisions to show. This can be either a single revision\n-- \n1.5.5.1.91.gb5ae\n"}]}