{"thread":{"id":"31225","subject":"[PATCH v2] mergetool,difftool: Document --tool-help consistently","startedAt":"2012-08-10T07:39:22Z","lastAt":"2012-08-10T07:39:23Z","messageCount":2,"participants":["David Aguilar"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"196778","messageId":"1344584363-5933-1-git-send-email-davvid@gmail.com","threadId":"31225","inReplyTo":null,"subject":"[PATCH v2] mergetool,difftool: Document --tool-help consistently","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2012-08-10T07:39:22Z","receivedAt":"2012-08-10T07:39:22Z","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 <davvid@gmail.com>\n---\nIf you want to have --tool-help mentioned, use this patch.\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 <command>::\n --extcmd=<command>::\n \tSpecify a custom command for viewing diffs.\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex d7207bd..6b563c5 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -64,6 +64,9 @@ variable `mergetool.<tool>.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 merge 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":"196779","messageId":"1344584363-5933-2-git-send-email-davvid@gmail.com","threadId":"31225","inReplyTo":"1344584363-5933-1-git-send-email-davvid@gmail.com","subject":"[PATCH] mergetool,difftool: Simplify --tool-help documentation","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2012-08-10T07:39:23Z","receivedAt":"2012-08-10T07:39:23Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Remove the entry for --tool-help in the documentation as it is\nalready mentioned in the documentation for --tool.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\nIncompatible with the previous patch, but if you prefer to\nmention --tool-help in the docs for --tool only, then choose\nthis one.\n\n Documentation/git-difftool.txt | 3 ---\n 1 file changed, 3 deletions(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 313d54e..ee80b00 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -74,9 +74,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 <command>::\n --extcmd=<command>::\n \tSpecify a custom command for viewing diffs.\n-- \n1.7.12.rc2.16.g034161a\n"}]}