{"thread":{"id":"29959","subject":"[PATCH] Documentation/difftool: add deltawalker to list of valid diff tools","startedAt":"2012-03-15T16:28:26Z","lastAt":"2012-03-15T22:21:36Z","messageCount":4,"participants":["Tim Henigan","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"187048","messageId":"1331828906-5943-1-git-send-email-tim.henigan@gmail.com","threadId":"29959","inReplyTo":null,"subject":"[PATCH] Documentation/difftool: add deltawalker to list of valid diff tools","fromName":"Tim Henigan","fromEmail":"tim.henigan@gmail.com","sentAt":"2012-03-15T16:28:26Z","receivedAt":"2012-03-15T16:28:26Z","isPatch":true,"sender":{"key":"tim.henigan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42022?v=4"},"body":"deltawalker has been supported since 284a126c3ef3, but was not added\nto the list of valid diff tools reported by 'git difftool --help'.\n\nSigned-off-by: Tim Henigan \n---\n\nThe list of valid tools seems prone to error. Right now, there is nothing\nthat tells people to update this documentation when new config files are\nadded to 'mergetools'. Should I add a README to 'mergetools' with\ninstructions to update this file? Or would it be better to replace the\nlist in the help string with a more general statement like \" must\nmatch one of the files located in $(git --exec-path)/mergetools\"?\n\n\n Documentation/git-difftool.txt | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 19d473c..fe38f66 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -32,8 +32,9 @@ OPTIONS\n --tool=::\n \tUse the diff tool specified by .\n \tValid diff tools are:\n-\taraxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,\n-\tkompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.\n+\taraxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff,\n+\tkdiff3,\tkompare, meld, opendiff, p4merge, tkdiff, vimdiff and\n+\txxdiff.\n +\n If a diff tool is not specified, 'git difftool'\n will use the configuration variable `diff.tool`. If the\n-- \n1.7.10.rc1\n"},{"id":"187057","messageId":"7v3999k2h5.fsf@alter.siamese.dyndns.org","threadId":"29959","inReplyTo":"1331828906-5943-1-git-send-email-tim.henigan@gmail.com","subject":"Re: [PATCH] Documentation/difftool: add deltawalker to list of valid diff tools","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-15T20:56:22Z","receivedAt":"2012-03-15T20:56:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tim Henigan writes:\n\n> The list of valid tools seems prone to error. Right now, there is nothing\n> that tells people to update this documentation when new config files are\n> added to 'mergetools'. Should I add a README to 'mergetools' with\n> instructions to update this file? Or would it be better to replace the\n> list in the help string with a more general statement like \" must\n> match one of the files located in $(git --exec-path)/mergetools\"?\n\nI would prefer to rip most of them out from this list in the\ndocumentation, and refer people to ask the installed version of \"git\ndifftool\" to list them. After bc7a96a (mergetool--lib: Refactor tools\ninto separate files, 2011-08-18), that should be the most sensible option.\nI.e.\n\n\t--tool=::\n\t\tUse the diff tool specified by . Valid diff tools\n include emerge, kompare, meld, and vimdiff; for complete\n list, run 'git difftool --tool-help'\n\nor something.\n"},{"id":"187062","messageId":"7vobrxik6s.fsf@alter.siamese.dyndns.org","threadId":"29959","inReplyTo":"7v3999k2h5.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/difftool: add deltawalker to list of valid diff tools","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-15T22:16:43Z","receivedAt":"2012-03-15T22:16:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Tim Henigan writes:\n>\n>> The list of valid tools seems prone to error. Right now, there is nothing\n>> that tells people to update this documentation when new config files are\n>> added to 'mergetools'. Should I add a README to 'mergetools' with\n>> instructions to update this file? Or would it be better to replace the\n>> list in the help string with a more general statement like \" must\n>> match one of the files located in $(git --exec-path)/mergetools\"?\n>\n> I would prefer to rip most of them out from this list in the\n> documentation, and refer people to ask the installed version of \"git\n> difftool\" to list them. After bc7a96a (mergetool--lib: Refactor tools\n> into separate files, 2011-08-18), that should be the most sensible option.\n> I.e.\n>\n> \t--tool=::\n> \t\tUse the diff tool specified by . Valid diff tools\n> include emerge, kompare, meld, and vimdiff; for complete\n> list, run 'git difftool --tool-help'\n>\n> or something.\n\nThe above is the longer-term direction. I'll apply your patch to add\nanother new tool to the existing list for 1.7.10.\n"},{"id":"187063","messageId":"CAFoueth3kwrm7rbLnN0sipOvFUgFW_YdRS8Z0+Uk+puFsaRSLg@mail.gmail.com","threadId":"29959","inReplyTo":"7vobrxik6s.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/difftool: add deltawalker to list of valid diff tools","fromName":"Tim Henigan","fromEmail":"tim.henigan@gmail.com","sentAt":"2012-03-15T22:21:36Z","receivedAt":"2012-03-15T22:21:36Z","isPatch":true,"sender":{"key":"tim.henigan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42022?v=4"},"body":"On Thu, Mar 15, 2012 at 6:16 PM, Junio C Hamano wrote:\n>\n> The above is the longer-term direction. I'll apply your patch to add\n> another new tool to the existing list for 1.7.10.\n\nI am almost done with a patch to do this...I was planning to send it\nin the next few minutes.\n\nThanks,\nTim\n"}]}