Re: [PATCH v3 3/6] Change 'git' to 'Git' whenever the whole system is referred to #2

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 23, 2013, 00:53 UTC
Message-ID: <7va9s0lnxn.fsf@alter.siamese.dyndns.org>
In-Reply-To: <2009548606.632825.1358795980319.JavaMail.ngmail@webmail20.arcor-online.net>

Thomas Ackermann <th.acker@arcor.de> writes:

Show 11 quoted lines

> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index b87f744..5a831ad2 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1,14 +1,14 @@
>  CONFIGURATION FILE
>  ------------------
>  
> -The git configuration file contains a number of variables that affect
> +The Git configuration file contains a number of variables that affect
>  the git command's behavior. The `.git/config` file in each repository

I am torn on this one, in the sense that there are configuration variables that changes the behaviour of 'git' wrapper itself, but this explanation is talking more about all the 161 subcommands (no, I am just kidding and didn't count) in the Git suite in general, so I think s/git/Git/ is probably more appropriate.

Show 8 quoted lines

> @@ -1039,7 +1039,7 @@ format.subjectprefix::
>  
>  format.signature::
>  	The default for format-patch is to output a signature containing
> -	the git version number. Use this variable to change that default.
> +	the Git version number. Use this variable to change that default.
>  	Set this variable to the empty string ("") to suppress
>  	signature generation.

Before this hunk, fetch.unpackLimit has this:

	If the number of objects fetched over the git native
	transfer is below...

s/git/Git/ is needed, I think.

Show 10 quoted lines

> diff --git a/Documentation/git-remote-helpers.txt b/Documentation/git-remote-helpers.txt
> index 6d696e0..e18c3b0 100644
> --- a/Documentation/git-remote-helpers.txt
> +++ b/Documentation/git-remote-helpers.txt
> @@ -45,9 +45,9 @@ argument specifies a URL; it is usually of the form
>  '<transport>://<address>', but any arbitrary string is possible.
>  The 'GIT_DIR' environment variable is set up for the remote helper
>  and can be used to determine where to store additional data or from
> -which directory to invoke auxiliary git commands.
> +which directory to invoke auxiliary Git commands.

The paragraph begins with this:

 Remote helper programs are invoked with one or (optionally) two
 arguments. The first argument specifies a remote repository as in git;

s/git/Git/ is needed, I think.

Show 12 quoted lines

> diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
> index cd23076..d4ae05b 100644
> --- a/Documentation/git-verify-pack.txt
> +++ b/Documentation/git-verify-pack.txt
> @@ -14,7 +14,7 @@ SYNOPSIS
>  
>  DESCRIPTION
>  -----------
> -Reads given idx file for packed git archive created with the
> +Reads given idx file for packed Git archive created with the
>  'git pack-objects' command and verifies idx file and the
>  corresponding pack file.

The NAME section lists it as "Validate packed git archive files", which wants a s/git/Git/, I think.

Show 20 quoted lines

> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index 2698f63..b9c0eec 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -417,11 +417,11 @@ Generating diff text
>  `diff`
>  ^^^^^^
>  
> -The attribute `diff` affects how 'git' generates diffs for particular
> -files. It can tell git whether to generate a textual patch for the path
> +The attribute `diff` affects how Git generates diffs for particular
> +files. It can tell Git whether to generate a textual patch for the path
>  or to treat the path as a binary file.  It can also affect what line is
> -shown on the hunk header `@@ -k,l +n,m @@` line, tell git to use an
> -external command to generate the diff, or ask git to convert binary
> +shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an
> +external command to generate the diff, or ask Git to convert binary
>  files to a text format before generating the diff.
>  
>  Set::

After this hunk, the description of "String" type says this:

	... are defined by the configuration variables in the
        "diff.foo" section of the git config file.

s/git/Git/ is needed, I think.

Show 9 quoted lines

> @@ -650,7 +650,7 @@ advantages to choosing this method:
>     odt2txt).
>  
>  2. Git diff features. By performing only the transformation step
> -   yourself, you can still utilize many of git's diff features,
> +   yourself, you can still utilize many of Git's diff features,
>     including colorization, word-diff, and combined diffs for merges.
>  
>  3. Caching. Textconv caching can speed up repeated diffs, such as those

After this hunk, in "Marking file as binary" section, you have

	This will cause git to generate `Binary files differ`...

s/git/Git/ is needed, I think.

As before, I'll locally create a fixup commit based on the above.

After I am done with these patches, somebody (not Thomas or I, as our eyes are too used to staring at git and Git to notice mistakes) has to run "git grep -C3 -e '\<Git\>' Documentation/" and eyeball the output to spot mistakes that should have been "git" but was converted to "Git", as I am mostly concentrating on finding "git" that should have been converted in Thomas's series.

Thanks.