threads / patch / 18527

patchDocumentation: minor consistency fixes in git-difftool.txt.

Subject: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.

## tl;dr

4 messages between Mar 25, 2009 and Mar 26, 2009. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

David Aguilar· Mar 25, 2009, 06:14 UTC · lore

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 Documentation/git-difftool.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Show changes to Documentation/git-difftool.txt +3 −3

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>::
 --tool=<tool>::
 	Use the diff tool specified by <tool>.
-	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· Mar 25, 2009, 07:17 UTC · re: David Aguilar · lore

Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.

David Aguilar <davvid@gmail.com> writes:

Show 15 quoted lines

> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
>  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· Mar 25, 2009, 10:21 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.

Junio C Hamano venit, vidit, dixit 25.03.2009 08:17:

Show 24 quoted lines

> David Aguilar <davvid@gmail.com> writes:
> 
>> Signed-off-by: David Aguilar <davvid@gmail.com>
>> ---
>>  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· Mar 26, 2009, 04:17 UTC · re: Michael J Gruber · lore

Re: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.

On  0, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 23 quoted lines

> Junio C Hamano venit, vidit, dixit 25.03.2009 08:17:
> > David Aguilar <davvid@gmail.com> 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