{"thread":{"id":"18527","subject":"[PATCH] Documentation: minor consistency fixes in git-difftool.txt.","startedAt":"2009-03-25T06:14:15Z","lastAt":"2009-03-26T04:17:41Z","messageCount":4,"participants":["David Aguilar","Junio C Hamano","Michael J Gruber"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"109317","messageId":"1237961655-29147-1-git-send-email-davvid@gmail.com","threadId":"18527","inReplyTo":null,"subject":"[PATCH] Documentation: minor consistency fixes in git-difftool.txt.","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-03-25T06:14:15Z","receivedAt":"2009-03-25T06:14:15Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Signed-off-by: David Aguilar \n---\n Documentation/git-difftool.txt | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 5ae02f8..23070c1 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n 'git-difftool' is a git command that allows you to compare and edit files\n-between revisions using common diff tools. 'git difftool' is a frontend\n+between revisions using common diff tools. 'git-difftool' is a frontend\n to 'git-diff' and accepts the same options and arguments.\n \n OPTIONS\n@@ -23,7 +23,7 @@ OPTIONS\n -t ::\n --tool=::\n \tUse the diff tool specified by .\n-\tValid merge tools are:\n+\tValid diff tools are:\n \tkdiff3, kompare, tkdiff, meld, xxdiff, emerge,\n \tvimdiff, gvimdiff, ecmerge, and opendiff\n +\n@@ -50,7 +50,7 @@ variables available: `$LOCAL` is set to the name of the temporary\n file containing the contents of the diff pre-image and `$REMOTE`\n is set to the name of the temporary file containing the contents\n of the diff post-image. `$BASE` is provided for compatibility\n-with custom merge tool commands and has the same value as `$LOCAL`.\n+with custom 'git-mergetool' commands and has the same value as `$LOCAL`.\n \n See linkgit:git-diff[1] for the full list of supported options.\n \n-- \n1.6.2.1.303.g63699\n"},{"id":"109325","messageId":"7vocvq842a.fsf@gitster.siamese.dyndns.org","threadId":"18527","inReplyTo":"1237961655-29147-1-git-send-email-davvid@gmail.com","subject":"Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-25T07:17:01Z","receivedAt":"2009-03-25T07:17:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Aguilar writes:\n\n> Signed-off-by: David Aguilar \n> ---\n> Documentation/git-difftool.txt | 6 +++---\n> 1 files changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\n> index 5ae02f8..23070c1 100644\n> --- a/Documentation/git-difftool.txt\n> +++ b/Documentation/git-difftool.txt\n> @@ -12,7 +12,7 @@ SYNOPSIS\n> DESCRIPTION\n> -----------\n> 'git-difftool' is a git command that allows you to compare and edit files\n> -between revisions using common diff tools. 'git difftool' is a frontend\n> +between revisions using common diff tools. 'git-difftool' is a frontend\n\nI thought that the recent trend is to spell these as 'git difftool' (two\nseparate words), although I didn't follow the discussion on quoting styles\nclosely, so I do not know which of sq, dq or backtick is preferred.\n\nCan somebody help me out here?\n"},{"id":"109331","messageId":"49CA05B2.7020207@drmicha.warpmail.net","threadId":"18527","inReplyTo":"7vocvq842a.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2009-03-25T10:21:38Z","receivedAt":"2009-03-25T10:21:38Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 25.03.2009 08:17:\n> David Aguilar writes:\n> \n>> Signed-off-by: David Aguilar \n>> ---\n>> Documentation/git-difftool.txt | 6 +++---\n>> 1 files changed, 3 insertions(+), 3 deletions(-)\n>>\n>> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\n>> index 5ae02f8..23070c1 100644\n>> --- a/Documentation/git-difftool.txt\n>> +++ b/Documentation/git-difftool.txt\n>> @@ -12,7 +12,7 @@ SYNOPSIS\n>> DESCRIPTION\n>> -----------\n>> 'git-difftool' is a git command that allows you to compare and edit files\n>> -between revisions using common diff tools. 'git difftool' is a frontend\n>> +between revisions using common diff tools. 'git-difftool' is a frontend\n> \n> I thought that the recent trend is to spell these as 'git difftool' (two\n> separate words), although I didn't follow the discussion on quoting styles\n> closely, so I do not know which of sq, dq or backtick is preferred.\n> \n> Can somebody help me out here?\n> \n\nI'd say it's backticks for commands/code, but I think discussion about a\nstyle guide is still on.\n\nMichael\n"},{"id":"109474","messageId":"20090326041740.GA21285@gmail.com","threadId":"18527","inReplyTo":"49CA05B2.7020207@drmicha.warpmail.net","subject":"Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-03-26T04:17:41Z","receivedAt":"2009-03-26T04:17:41Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On 0, Michael J Gruber wrote:\n> Junio C Hamano venit, vidit, dixit 25.03.2009 08:17:\n> > David Aguilar writes:\n> > \n> >> --- a/Documentation/git-difftool.txt\n> >> +++ b/Documentation/git-difftool.txt\n> >> @@ -12,7 +12,7 @@ SYNOPSIS\n> >> DESCRIPTION\n> >> -----------\n> >> 'git-difftool' is a git command that allows you to compare and edit files\n> >> -between revisions using common diff tools. 'git difftool' is a frontend\n> >> +between revisions using common diff tools. 'git-difftool' is a frontend\n> > \n> > I thought that the recent trend is to spell these as 'git difftool' (two\n> > separate words), although I didn't follow the discussion on quoting styles\n> > closely, so I do not know which of sq, dq or backtick is preferred.\n> > \n> > Can somebody help me out here?\n> > \n> \n> I'd say it's backticks for commands/code, but I think discussion about a\n> style guide is still on.\n> \n> Michael\n\n\nCool, I'll keep my eye on it.\n\nI was merely going for consistency with the existing\ndocumentation (such as git-mergetool.txt).\nOnce a consensus is reached I'll go ahead and follow suite.\n\nThanks,\n\n-- \n\n\tDavid\n"}]}