{"thread":{"id":"28936","subject":"[PATCH] documentation fix: git difftool uses diff tools, not merge tools.","startedAt":"2011-11-14T22:55:52Z","lastAt":"2011-11-21T12:25:33Z","messageCount":3,"participants":["Thomas Hochstein","Junio C Hamano","David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"179460","messageId":"1321311352-8950-1-git-send-email-thh@inter.net","threadId":"28936","inReplyTo":null,"subject":"[PATCH] documentation fix: git difftool uses diff tools, not merge tools.","fromName":"Thomas Hochstein","fromEmail":"thh@inter.net","sentAt":"2011-11-14T22:55:52Z","receivedAt":"2011-11-14T22:55:52Z","isPatch":true,"sender":{"key":"thh@inter.net","avatar":"https://avatars.githubusercontent.com/u/365129?v=4"},"body":"Let the documentation for -t list valid *diff* tools,\nnot valid *merge* tools.\n\nSigned-off-by: Thomas Hochstein <thh@inter.net>\n---\n Documentation/git-difftool.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex a03515f..19d473c 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -31,7 +31,7 @@ OPTIONS\n -t <tool>::\n --tool=<tool>::\n \tUse the diff tool specified by <tool>.\n-\tValid merge tools are:\n+\tValid diff tools are:\n \taraxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,\n \tkompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.\n +\n-- \n1.7.2.5\n"},{"id":"179462","messageId":"7v62imi6c7.fsf@alter.siamese.dyndns.org","threadId":"28936","inReplyTo":"1321311352-8950-1-git-send-email-thh@inter.net","subject":"Re: [PATCH] documentation fix: git difftool uses diff tools, not merge tools.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-11-15T00:20:56Z","receivedAt":"2011-11-15T00:20:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Hochstein <thh@inter.net> writes:\n\n> Let the documentation for -t list valid *diff* tools,\n> not valid *merge* tools.\n>\n> Signed-off-by: Thomas Hochstein <thh@inter.net>\n> ---\n>  Documentation/git-difftool.txt |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\n> index a03515f..19d473c 100644\n> --- a/Documentation/git-difftool.txt\n> +++ b/Documentation/git-difftool.txt\n> @@ -31,7 +31,7 @@ OPTIONS\n>  -t <tool>::\n>  --tool=<tool>::\n>  \tUse the diff tool specified by <tool>.\n> -\tValid merge tools are:\n> +\tValid diff tools are:\n>  \taraxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,\n>  \tkompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.\n>  +\n\nThe patch is obviously correct, and it is so trivial that there is no risk\nof breaking anything. It would even be OK for 1.7.7.X maintenance series.\n\nBut in the longer term, I suspect that we would want to drop this\nenumeration from the documentation, and instead give \"--list-tools\"\noption or something to the command. That way, we only need to keep\nthe list of known tools in one place where it matters, namely, the\ncommand that knows about them.\n\nDavid, what do you think?\n\nThe same comment applies to \"git mergetool\", I would think.\n"},{"id":"179781","messageId":"CAJDDKr6vrWqZ_KcyDeGWbiy41ncRtgj9OgF9rSW+YxZZJBFK7Q@mail.gmail.com","threadId":"28936","inReplyTo":"7v62imi6c7.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] documentation fix: git difftool uses diff tools, not merge tools.","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2011-11-21T12:25:33Z","receivedAt":"2011-11-21T12:25:33Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Mon, Nov 14, 2011 at 4:20 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> Thomas Hochstein <thh@inter.net> writes:\n>\n>> Let the documentation for -t list valid *diff* tools,\n>> not valid *merge* tools.\n>>\n>> Signed-off-by: Thomas Hochstein <thh@inter.net>\n>> ---\n>>  Documentation/git-difftool.txt |    2 +-\n>>  1 files changed, 1 insertions(+), 1 deletions(-)\n>>\n>> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\n>> index a03515f..19d473c 100644\n>> --- a/Documentation/git-difftool.txt\n>> +++ b/Documentation/git-difftool.txt\n>> @@ -31,7 +31,7 @@ OPTIONS\n>>  -t <tool>::\n>>  --tool=<tool>::\n>>       Use the diff tool specified by <tool>.\n>> -     Valid merge tools are:\n>> +     Valid diff tools are:\n>>       araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,\n>>       kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.\n>>  +\n>\n> The patch is obviously correct, and it is so trivial that there is no risk\n> of breaking anything. It would even be OK for 1.7.7.X maintenance series.\n>\n> But in the longer term, I suspect that we would want to drop this\n> enumeration from the documentation, and instead give \"--list-tools\"\n> option or something to the command. That way, we only need to keep\n> the list of known tools in one place where it matters, namely, the\n> command that knows about them.\n>\n> David, what do you think?\n>\n> The same comment applies to \"git mergetool\", I would think.\n\nExactly my thoughts.\n-- \n    David\n"}]}