# [PATCH] Documentation: minor consistency fixes in git-difftool.txt. 4 messages from 2009-03-25 to 2009-03-26. Participants: David Aguilar, Junio C Hamano, Michael J Gruber. Thread: https://gitlist.dev/t/18527 ## David Aguilar, 2009-03-25 06:14 Subject: [PATCH] Documentation: minor consistency fixes in git-difftool.txt. Message-ID: <1237961655-29147-1-git-send-email-davvid@gmail.com> URL: https://gitlist.dev/e/1237961655-29147-1-git-send-email-davvid%40gmail.com ``` Signed-off-by: David Aguilar --- Documentation/git-difftool.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 5ae02f8..23070c1 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- 'git-difftool' is a git command that allows you to compare and edit files -between revisions using common diff tools. 'git difftool' is a frontend +between revisions using common diff tools. 'git-difftool' is a frontend to 'git-diff' and accepts the same options and arguments. OPTIONS @@ -23,7 +23,7 @@ OPTIONS -t :: --tool=:: Use the diff tool specified by . - Valid merge tools are: + Valid diff tools are: kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + @@ -50,7 +50,7 @@ variables available: `$LOCAL` is set to the name of the temporary file containing the contents of the diff pre-image and `$REMOTE` is set to the name of the temporary file containing the contents of the diff post-image. `$BASE` is provided for compatibility -with custom merge tool commands and has the same value as `$LOCAL`. +with custom 'git-mergetool' commands and has the same value as `$LOCAL`. See linkgit:git-diff[1] for the full list of supported options. -- 1.6.2.1.303.g63699 ``` ## Junio C Hamano, 2009-03-25 07:17 Subject: Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt. Message-ID: <7vocvq842a.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vocvq842a.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1237961655-29147-1-git-send-email-davvid@gmail.com> ``` David Aguilar writes: > Signed-off-by: David Aguilar > --- > Documentation/git-difftool.txt | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt > index 5ae02f8..23070c1 100644 > --- a/Documentation/git-difftool.txt > +++ b/Documentation/git-difftool.txt > @@ -12,7 +12,7 @@ SYNOPSIS > DESCRIPTION > ----------- > 'git-difftool' is a git command that allows you to compare and edit files > -between revisions using common diff tools. 'git difftool' is a frontend > +between revisions using common diff tools. 'git-difftool' is a frontend I thought that the recent trend is to spell these as 'git difftool' (two separate words), although I didn't follow the discussion on quoting styles closely, so I do not know which of sq, dq or backtick is preferred. Can somebody help me out here? ``` ## Michael J Gruber, 2009-03-25 10:21 Subject: Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt. Message-ID: <49CA05B2.7020207@drmicha.warpmail.net> URL: https://gitlist.dev/e/49CA05B2.7020207%40drmicha.warpmail.net In-Reply-To: <7vocvq842a.fsf@gitster.siamese.dyndns.org> ``` Junio C Hamano venit, vidit, dixit 25.03.2009 08:17: > David Aguilar writes: > >> Signed-off-by: David Aguilar >> --- >> Documentation/git-difftool.txt | 6 +++--- >> 1 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt >> index 5ae02f8..23070c1 100644 >> --- a/Documentation/git-difftool.txt >> +++ b/Documentation/git-difftool.txt >> @@ -12,7 +12,7 @@ SYNOPSIS >> DESCRIPTION >> ----------- >> 'git-difftool' is a git command that allows you to compare and edit files >> -between revisions using common diff tools. 'git difftool' is a frontend >> +between revisions using common diff tools. 'git-difftool' is a frontend > > I thought that the recent trend is to spell these as 'git difftool' (two > separate words), although I didn't follow the discussion on quoting styles > closely, so I do not know which of sq, dq or backtick is preferred. > > Can somebody help me out here? > I'd say it's backticks for commands/code, but I think discussion about a style guide is still on. Michael ``` ## David Aguilar, 2009-03-26 04:17 Subject: Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt. Message-ID: <20090326041740.GA21285@gmail.com> URL: https://gitlist.dev/e/20090326041740.GA21285%40gmail.com In-Reply-To: <49CA05B2.7020207@drmicha.warpmail.net> ``` On 0, Michael J Gruber wrote: > Junio C Hamano venit, vidit, dixit 25.03.2009 08:17: > > David Aguilar writes: > > > >> --- a/Documentation/git-difftool.txt > >> +++ b/Documentation/git-difftool.txt > >> @@ -12,7 +12,7 @@ SYNOPSIS > >> DESCRIPTION > >> ----------- > >> 'git-difftool' is a git command that allows you to compare and edit files > >> -between revisions using common diff tools. 'git difftool' is a frontend > >> +between revisions using common diff tools. 'git-difftool' is a frontend > > > > I thought that the recent trend is to spell these as 'git difftool' (two > > separate words), although I didn't follow the discussion on quoting styles > > closely, so I do not know which of sq, dq or backtick is preferred. > > > > Can somebody help me out here? > > > > I'd say it's backticks for commands/code, but I think discussion about a > style guide is still on. > > Michael Cool, I'll keep my eye on it. I was merely going for consistency with the existing documentation (such as git-mergetool.txt). Once a consensus is reached I'll go ahead and follow suite. Thanks, -- David ```