Re: [PATCH v3 2/6] Change 'git' to 'Git' whenever the whole system is referred to #1
In Documentation/git-rev-parse.txt, there is this bit: --resolve-git-dir :: Check if is a valid git-dir or a git-file pointing to a valid git-dir. If is a valid git-dir the resolved path to git-dir will be printed. I think the author invented the word "git-dir" to mean what we ordinarily call $GIT_DIR (i.e. the directory that contains the repository data), and used "git-file" to mean what the code and error messages call "gitfile". I think it is better to leave these in lowercase, but we would need them in the glossary, probably after rewriting the latter to "gitfile". The former may want to be rewritten to "gitdir" or even "$GIT_DIR". -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 2/6] Change 'git' to 'Git' whenever the whole system is referred to #1
Junio C Hamano writes:
> This is the summary of the review comments in a patch form.
>
And then there still are the ones in the file that was touched by
Thomas's 2/6 that need fixing.
Documentation/git-apply.txt | 2 +-
Documentation/git-archimport.txt | 2 +-
Documentation/git-cvsserver.txt | 8
Documentation/git-help.txt | 2 +-
Documentation/git-mergetool--lib.txt | 2 +-
Documentation/git-p4.txt | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index c1704dc..f605327 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -198,7 +198,7 @@ behavior:
* `fix` outputs warnings for a few such errors, and applies the
patch after fixing them (`strip` is a synonym --- the tool
used to consider only trailing whitespace characters as errors, and the
- fix involved 'stripping' them, but modern gits do more).
+ fix involved 'stripping' them, but modern Gits do more).
* `error` outputs warnings for a few such errors, and refuses
to apply the patch.
* `error-all` is similar to `error` but shows all errors.
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index 25b1cab..163b9f6 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -3,7 +3,7 @@ git-archimport(1)
NAME
-git-archimport - Import an Arch repository into git
+git-archimport - Import an Arch repository into Git
SYNOPSIS
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index dc5069f..7ca64b3 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -3,7 +3,7 @@ git-cvsserver(1)
NAME
-git-cvsserver - A CVS server emulator for git
+git-cvsserver - A CVS server emulator for Git
SYNOPSIS
@@ -291,14 +291,14 @@ Variable substitution
In `dbdriver` and `dbuser` you can use the following variables:
%G::
- git directory name
+ Git directory name
%g::
- git directory name, where all characters except for
+ Git directory name, where all characters except for
alpha-numeric ones, `.`, and `-` are replaced with
`_` (this should make it easier to use the directory
name in a filename if wanted)
%m::
- CVS module/git head name
+ CVS module/Git head name
%a::
access method (one of "ext" or "pserver")
%u::
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 835fba0..e07b6dc 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -3,7 +3,7 @@ git-help(1)
NAME
-git-help - display help information about git
+git-help - Display help information about Git
SYNOPSIS
diff --git a/Documentation/git-mergetool--lib.txt
b/Documentation/git-mergetool--lib.txt
index b748bdf..00b 100644
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@ -3,7 +3,7 @@ git-mergetool{litdd}lib(1)
NAME
-git-mergetool--lib - Common git merge tool shell scriptlets
+git-mergetool--lib - Common Git merge tool shell scriptlets
SYNOPSIS
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 96a5b31..1d1b020 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -64,7 +64,7 @@ COMMANDS
Clone
~
-Generally, 'git p4 clone' is used to create a new git directory
+Generally, 'git p4 clone' is used to create a new Git directory
from an existing p4 repository:
$ git p4 clone //depot/path/project
@@ -494,7 +494,7 @@ git-p4.detectCopiesHarder::
Detect copies harder. See linkgit:git-diff[1]. A boolean.
git-p4.preserveUser::
- On submit, re-author changes to reflect the git author,
+ On submit, re-author changes to reflect the Git author,
regardless of who invokes 'git p4 submit'.
git-p4.allowMissingP4Users::
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 2/6] Change 'git' to 'Git' whenever the whole system is referred to #1
This is the summary of the review comments in a patch form. Subject: [PATCH] fixup! Change 'git' to 'Git' whenever the whole system is referred to #1 --- Documentation/Makefile | 4 ++-- Documentation/git-clean.txt | 2 +- Documentation/git-clone.txt | 2 +- Documentation/git-filter-branch.txt | 2 +- Documentation/git-help.txt | 2 +- Documentation/git-init.txt | 2 +- Documentation/git-rm.txt| 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index a7a4f75..c2d3ec1 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -346,8 +346,8 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt install-webdoc : html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) -# You must have a clone of git-htmldocs and git-manpages repositories -# next to the Git repository itself for the following to work. +# You must have a clone of 'git-htmldocs' and 'git-manpages' repositories +# next to the 'git' repository itself for the following to work. quick-install: quick-install-man diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 14bdbbb..bdc3ab8 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -27,7 +27,7 @@ OPTIONS --- -d:: Remove untracked directories in addition to untracked files. - If an untracked directory is managed by a different git + If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory. diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 47d9880..5c16e31 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -213,7 +213,7 @@ objects from the source repository into a pack in the cloned repository. --separate-git-dir=:: Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, - then make a filesytem-agnostic git symbolic link to there. + then make a filesytem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree. diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index c07ad61..dfd12c9 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -18,7 +18,7 @@ SYNOPSIS DESCRIPTION --- -Lets you rewrite git revision history by rewriting the branches mentioned +Lets you rewrite Git revision history by rewriting the branches mentioned in the , applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index 071e947..835fba0 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -20,7 +20,7 @@ on the standard output. If the option '--all' or '-a' is given, then all available commands are printed on the standard output. -If a git command is named, a manual page for that command is brought +If a Git subcommand is named, a manual page for that subcommand is brought up. The 'man' program is used by default for this purpose, but this can be overridden by other options or configuration variables. diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 2571f56..afd721e 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -59,7 +59,7 @@ DIRECTORY" section below.) Instead of initializing the repository where it is supposed to be, place a filesytem-agnostic Git symbolic link there, pointing to the -specified Git path, and initialize a Git repository at the path. The +specified path, and initialize a Git repository at the path. The result is Git repository can be separated from working tree. If this is reinitialization, the repository will be moved to the specified path. diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index 1e5ef3b..92bac27 100644 --- a/Documentation/git-rm.txt +++ b/Documentation/git-rm.txt @@ -75,7 +75,7 @@ DISCUSSION The list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to Git. Giving the name of -a file that you have not told git about does not remove that file. +a file that you have not told Git about does not remove that file. File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between -- 1.8.1.1.507.g1754052 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 2/6] Change 'git' to 'Git' whenever the whole system is referred to #1
Thomas Ackermann writes: > Signed-off-by: Thomas Ackermann > --- > diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt > index 9f42c0d..14bdbbb 100644 > --- a/Documentation/git-clean.txt > +++ b/Documentation/git-clean.txt > @@ -33,7 +33,7 @@ OPTIONS > > -f:: > --force:: > - If the git configuration variable clean.requireForce is not set > + If the Git configuration variable clean.requireForce is not set > to false, 'git clean' will refuse to run unless given -f or -n. Before this description, -d option talks about a different Git repository; s/git/Git/ is needed there. > diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt > index 597048b..47d9880 100644 > --- a/Documentation/git-clone.txt > +++ b/Documentation/git-clone.txt > @@ -214,7 +214,7 @@ objects from the source repository into a pack in the > cloned repository. > Instead of placing the cloned repository where it is supposed > to be, place the cloned repository at the specified directory, > then make a filesytem-agnostic git symbolic link to there. Shouldn't this be "Git symbolic link"? > diff --git a/Documentation/Makefile b/Documentation/Makefile > index 971977b..a7a4f75 100644 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -347,7 +347,7 @@ install-webdoc : html > '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) > > # You must have a clone of git-htmldocs and git-manpages repositories > -# next to the git repository itself for the following to work. > +# next to the Git repository itself for the following to work. > > quick-install: quick-install-man This is *wrong*. It refers to the name of the repository whose natural name is "git", as most people get it by git clone git://git.kernel.org/pub/scm/git/git.git and telling the users to do git clone git://git.kernel.org/pub/scm/git/git-htmldocs.git git clone git://git.kernel.org/pub/scm/git/git-manpages.git in the same directory as they cloned git.git into (i.e. have these two next to their clone of git.git, which is typically called "git"). I'll revert this part. > diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt > index 262436b..1e5ef3b 100644 > --- a/Documentation/git-rm.txt > +++ b/Documentation/git-rm.txt > @@ -74,7 +74,7 @@ DISCUSSION > > The list given to the command can be exact pathnames, > file glob patterns, or leading directory names. The command > -removes only the paths that are known to git. Giving the name of > +removes only the paths that are known to Git. Giving the name of > a file that you have not told git about does not remove that file. This should be "you have not told Git about". > diff --git a/Documentation/git-filter-branch.txt > b/Documentation/git-filter-branch.txt > index e2301f5..c07ad61 100644 > --- a/Documentation/git-filter-branch.txt > +++ b/Documentation/git-filter-branch.txt > @@ -29,7 +29,7 @@ The command will only rewrite the _positive_ refs mentioned > in the > command line (e.g. if you pass 'a..b', only 'b' will be rewritten). > If you specify no filters, the commits will be recommitted without any > changes, which would normally have no effect. Nevertheless, this may be > -useful in the future for compensating for some git bugs or such, > +useful in the future for compensating for some Git bugs or such, > therefore such a usage is permitted. The description before this hunk begins with "Lets you rewrite git version history", which you need s/git/Git/. > diff --git a/Documentation/git-format-patch.txt > b/Documentation/git-format-patch.txt > index 9a914d0..3a62f50 100644 > --- a/Documentation/git-format-patch.txt > +++ b/Documentation/git-format-patch.txt > @@ -525,8 +525,8 @@ $ git format-patch -M -B origin > Additionally, it detects and handles renames and complete rewrites > intelligently to produce a renaming patch. A renaming patch reduces > the amount of text output, and generally makes it easier to review. > -Note that non-git "patch" programs won't understand renaming patches, so > -use it only when you know the recipient uses git to apply your patch. > +Note that non-Git "patch" programs won't understand renaming patches, so > +use it only when you know the recipient uses Git to apply your patch. Unrelated to the topic of this series, but didn't GNU patch add this recently? Somebody needs a fact-check and may have to update the above with something like "prior to GNU patch x.y..." > diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt > index 9e0b3f6..071e947 100644 > --- a/Documentation/git-help.txt > +++ b/Documentation/git-help.txt > @@ -14,7 +14,7 @@ DESCRIPTION > --- > > With no options and no COMMAND given, the synopsis of the 'git' > -command and a list of the most commonly used git commands are printed > +command and a list of the most commonly used Git commands are printed > on the standard output. > > If the opti
Re: [PATCH v3 2/6] Change 'git' to 'Git' whenever the whole system is referred to #1
Thomas Ackermann writes: > Signed-off-by: Thomas Ackermann > --- > Forgot --stat? It helps to check the integrity of patch application and also helps anticipating possible interaction with other topics in flight. Please don't omit it. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
