{"thread":{"id":"17246","subject":"[PATCH 1/2] difftool: fix documentation problems","startedAt":"2009-01-19T05:27:19Z","lastAt":"2009-01-19T05:27:20Z","messageCount":2,"participants":["David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"101099","messageId":"1232342840-27459-1-git-send-email-davvid@gmail.com","threadId":"17246","inReplyTo":null,"subject":"[PATCH 1/2] difftool: fix documentation problems","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-01-19T05:27:19Z","receivedAt":"2009-01-19T05:27:19Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"This patch makes the difftool docs always refer to the\ngit-difftool script using the dashed form of the name.\nOnly command examples use the non-dashed form now.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n contrib/difftool/git-difftool     |    5 ++---\n contrib/difftool/git-difftool.txt |   20 ++++++++++----------\n 2 files changed, 12 insertions(+), 13 deletions(-)\n\ndiff --git a/contrib/difftool/git-difftool b/contrib/difftool/git-difftool\nindex 1fc087c..0cda3d2 100755\n--- a/contrib/difftool/git-difftool\n+++ b/contrib/difftool/git-difftool\n@@ -4,7 +4,7 @@\n # This is a wrapper around the GIT_EXTERNAL_DIFF-compatible\n # git-difftool-helper script.  This script exports\n # GIT_EXTERNAL_DIFF and GIT_PAGER for use by git, and\n-# GIT_NO_PROMPT and GIT_MERGE_TOOL for use by git-difftool-helper.\n+# GIT_DIFFTOOL_NO_PROMPT and GIT_MERGE_TOOL for use by git-difftool-helper.\n # Any arguments that are unknown to this script are forwarded to 'git diff'.\n \n use strict;\n@@ -18,8 +18,7 @@ my $DIR = abs_path(dirname($0));\n sub usage\n {\n \tprint << 'USAGE';\n-\n-usage: git difftool [--no-prompt] [--tool=tool] [\"git diff\" options]\n+usage: git difftool [--tool=<tool>] [--no-prompt] [\"git diff\" options]\n USAGE\n \texit 1;\n }\ndiff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt\nindex 3940c70..ca3dbd2 100644\n--- a/contrib/difftool/git-difftool.txt\n+++ b/contrib/difftool/git-difftool.txt\n@@ -11,16 +11,16 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-'git difftool' is a git command that allows you to compare and edit files\n+'git-difftool' is a git command that allows you to compare and edit files\n between revisions using common merge tools.  At its most basic level,\n-'git difftool' does what 'git mergetool' does but its use is for non-merge\n+'git-difftool' does what 'git-mergetool' does but its use is for non-merge\n situations such as when preparing commits or comparing changes against\n the index.\n \n 'git difftool' is a frontend to 'git diff' and accepts the same\n arguments and options.\n \n-See linkgit:git-diff[7] for the full list of supported options.\n+See linkgit:git-diff[1] for the full list of supported options.\n \n OPTIONS\n -------\n@@ -30,7 +30,7 @@ OPTIONS\n \tValid merge tools are:\n \tkdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff\n +\n-If a merge resolution program is not specified, 'git difftool'\n+If a merge resolution program is not specified, 'git-difftool'\n will use the configuration variable `merge.tool`.  If the\n configuration variable `merge.tool` is not set, 'git difftool'\n will pick a suitable default.\n@@ -38,15 +38,15 @@ will pick a suitable default.\n You can explicitly provide a full path to the tool by setting the\n configuration variable `mergetool.<tool>.path`. For example, you\n can configure the absolute path to kdiff3 by setting\n-`mergetool.kdiff3.path`. Otherwise, 'git difftool' assumes the\n+`mergetool.kdiff3.path`. Otherwise, 'git-difftool' assumes the\n tool is available in PATH.\n +\n Instead of running one of the known merge tool programs,\n-'git difftool' can be customized to run an alternative program\n+'git-difftool' can be customized to run an alternative program\n by specifying the command line to invoke in a configuration\n variable `mergetool.<tool>.cmd`.\n +\n-When 'git difftool' is invoked with this tool (either through the\n+When 'git-difftool' is invoked with this tool (either through the\n `-t` or `--tool` option or the `merge.tool` configuration variable)\n the configured command line will be invoked with the following\n variables available: `$LOCAL` is set to the name of the temporary\n@@ -56,7 +56,7 @@ of the diff post-image.  `$BASE` is provided for compatibility\n with custom merge tool commands and has the same value as `$LOCAL`.\n \n --no-prompt::\n-\tDo not prompt before launching a merge tool.\n+\tDo not prompt before launching a diff tool.\n \n CONFIG VARIABLES\n ----------------\n@@ -81,13 +81,13 @@ See the `--tool=<tool>` option above for more details.\n \n SEE ALSO\n --------\n-linkgit:git-diff[7]::\n+linkgit:git-diff[1]::\n \t Show changes between commits, commit and working tree, etc\n \n linkgit:git-mergetool[1]::\n \tRun merge conflict resolution tools to resolve merge conflicts\n \n-linkgit:git-config[7]::\n+linkgit:git-config[1]::\n \t Get and set repository or global options\n \n \n-- \n1.6.1.149.g7bbd8\n"},{"id":"101100","messageId":"1232342840-27459-2-git-send-email-davvid@gmail.com","threadId":"17246","inReplyTo":"1232342840-27459-1-git-send-email-davvid@gmail.com","subject":"[PATCH 2/2] difftool: put the cursor on the editable file for Vim","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-01-19T05:27:20Z","receivedAt":"2009-01-19T05:27:20Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"You only need to edit worktree files when comparing against\nthe worktree.  Put the cursor automatically into its window for\nvimdiff and gvimdiff to avoid doing <C-w>r every time.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n contrib/difftool/git-difftool-helper |    8 ++++++--\n 1 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper\nindex 0b266e3..a6f862f 100755\n--- a/contrib/difftool/git-difftool-helper\n+++ b/contrib/difftool/git-difftool-helper\n@@ -78,12 +78,16 @@ launch_merge_tool () {\n \t\t\"$merge_tool_path\" -o \"$MERGED\" \"$LOCAL\" \"$REMOTE\"\n \t\t;;\n \n-\tmeld|vimdiff)\n+\tmeld)\n \t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\"\n \t\t;;\n \n+\tvimdiff)\n+\t\t\"$merge_tool_path\" -c \"wincmd r\" \"$LOCAL\" \"$REMOTE\"\n+\t\t;;\n+\n \tgvimdiff)\n-\t\t\"$merge_tool_path\" -f \"$LOCAL\" \"$REMOTE\"\n+\t\t\"$merge_tool_path\" -c \"wincmd r\" -f \"$LOCAL\" \"$REMOTE\"\n \t\t;;\n \n \txxdiff)\n-- \n1.6.1.149.g7bbd8\n"}]}