{"thread":{"id":"31224","subject":"[PATCH] mergetool,difftool: Document --tool-help consistently","startedAt":"2012-08-10T04:52:45Z","lastAt":"2012-08-10T15:04:44Z","messageCount":3,"participants":["David Aguilar","Sebastian Schuberth","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"196775","messageId":"1344574365-5534-1-git-send-email-davvid@gmail.com","threadId":"31224","inReplyTo":null,"subject":"[PATCH] mergetool,difftool: Document --tool-help consistently","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2012-08-10T04:52:45Z","receivedAt":"2012-08-10T04:52:45Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Add an entry for --tool-help to the mergetool documentation.\n\nMove --tool-help in the difftool documentation so that it is\nlisted immediately after --tool so that it is easier to find.\n\nSigned-off-by: David Aguilar \n---\nBased on work in next.\n\nThis is not urgent as the current difftool topics are cooking\nand will not be in the current release cycle.\n\n Documentation/git-difftool.txt | 6 +++---\n Documentation/git-mergetool.txt | 3 +++\n 2 files changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 313d54e..73ca702 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -66,6 +66,9 @@ of the diff post-image. `$MERGED` is the name of the file which is\n being compared. `$BASE` is provided for compatibility\n with custom merge tool commands and has the same value as `$MERGED`.\n \n+--tool-help::\n+\tPrint a list of diff tools that may be used with `--tool`.\n+\n --symlinks::\n --no-symlinks::\n \t'git difftool''s default behavior is create symlinks to the\n@@ -74,9 +77,6 @@ with custom merge tool commands and has the same value as `$MERGED`.\n \tSpecifying `--no-symlinks` instructs 'git difftool' to create\n \tcopies instead. `--no-symlinks` is the default on Windows.\n \n---tool-help::\n-\tPrint a list of diff tools that may be used with `--tool`.\n-\n -x ::\n --extcmd=::\n \tSpecify a custom command for viewing diffs.\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex d7207bd..7100237 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -64,6 +64,9 @@ variable `mergetool..trustExitCode` can be set to `true`.\n Otherwise, 'git mergetool' will prompt the user to indicate the\n success of the resolution after the custom tool has exited.\n \n+--tool-help::\n+\tPrint a list of diff tools that may be used with `--tool`.\n+\n -y::\n --no-prompt::\n \tDon't prompt before each invocation of the merge resolution\n-- \n1.7.12.rc2.16.g034161a\n"},{"id":"196777","messageId":"CAHGBnuMCLkALCCAp1MiwQ1J+TuUhD=4k3LTGP2BMrp1LThb=HQ@mail.gmail.com","threadId":"31224","inReplyTo":"1344574365-5534-1-git-send-email-davvid@gmail.com","subject":"Re: [PATCH] mergetool,difftool: Document --tool-help consistently","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2012-08-10T07:17:11Z","receivedAt":"2012-08-10T07:17:11Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"On Fri, Aug 10, 2012 at 6:52 AM, David Aguilar wrote:\n\n> Add an entry for --tool-help to the mergetool documentation.\n>\n> Move --tool-help in the difftool documentation so that it is\n> listed immediately after --tool so that it is easier to find.\n>\n> Signed-off-by: David Aguilar \n\nFunny, I was doing almost the same thing in [1], so I obviously like\nit. Back then Junio found it \"Meh\" because \"it already is mentioned in\nthe\ndescription of --tool above\", but I still think all available command\nline option should be listed as such.\n\n> --- a/Documentation/git-mergetool.txt\n> +++ b/Documentation/git-mergetool.txt\n> @@ -64,6 +64,9 @@ variable `mergetool..trustExitCode` can be set to `true`.\n> Otherwise, 'git mergetool' will prompt the user to indicate the\n> success of the resolution after the custom tool has exited.\n>\n> +--tool-help::\n> + Print a list of diff tools that may be used with `--tool`.\n> +\n\nThis should say \"list of merge tools\", however.\n\n[1] http://thread.gmane.org/gmane.comp.version-control.git/201913/focus=201922\n\n-- \nSebastian Schuberth\n"},{"id":"196798","messageId":"7vk3x6lreb.fsf@alter.siamese.dyndns.org","threadId":"31224","inReplyTo":"CAHGBnuMCLkALCCAp1MiwQ1J+TuUhD=4k3LTGP2BMrp1LThb=HQ@mail.gmail.com","subject":"Re: [PATCH] mergetool,difftool: Document --tool-help consistently","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-10T15:04:44Z","receivedAt":"2012-08-10T15:04:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sebastian Schuberth writes:\n\n> On Fri, Aug 10, 2012 at 6:52 AM, David Aguilar wrote:\n>\n>> Add an entry for --tool-help to the mergetool documentation.\n>>\n>> Move --tool-help in the difftool documentation so that it is\n>> listed immediately after --tool so that it is easier to find.\n>>\n>> Signed-off-by: David Aguilar \n>\n> Funny, I was doing almost the same thing in [1], so I obviously\n> like it. Back then Junio found it \"Meh\" because \"it already is\n> mentioned in the description of --tool above\", but I still think\n> all available command line option should be listed as such.\n\nEither way is fine by me. Even though I do not think it adds much\nvalue, there is no reason to hiding the option; it is not like we\nare discouraging the use of it.\n\nLet's take the version with the description of --tool-help, then,\nand have it next to the description of --tool.\n\nThanks for sanity checking.\n\n>> --- a/Documentation/git-mergetool.txt\n>> +++ b/Documentation/git-mergetool.txt\n>> @@ -64,6 +64,9 @@ variable `mergetool..trustExitCode` can be set to `true`.\n>> Otherwise, 'git mergetool' will prompt the user to indicate the\n>> success of the resolution after the custom tool has exited.\n>>\n>> +--tool-help::\n>> + Print a list of diff tools that may be used with `--tool`.\n>> +\n>\n> This should say \"list of merge tools\", however.\n\nWill amend while queuing.\n\nThanks.\n"}]}