Re: Aw: Re: [PATCH 1/2] Change old system name 'GIT' to 'Git'
Thomas Ackermann writes: >> If I were to decide today to change the spellings, with an explicit >> purpose of making things more consistent across documentation, it >> may make sense to use even a simpler rule that is less error-prone >> for people who write new sentences that has to have the word. How >> about treating it just like any other ordinary word? That is, we >> say "git" (without double-quotes, of course), unless it comes at the >> beginning of a sentence? >> > > The widely used books on Git by Scott Chacon or Jon Loeliger (and > many others) are using 'Git' instead of 'git' when talking about the > whole system. So IMHO it would not be wise to change our internal > documentation from using 'GIT'/'Git' to using 'git'. The internal > documentation should be a natural continuation of these books > by content and style. That argument is going the other way around (we _are_ the authoritative source). But I am OK with "Git" as a proper noun (which always begins with capital letter), using "git" only when it is something the user would type. Just come up with a simple-to-explain rule so that people will have no doubt which one to use in their new text and stick to it. Thanks. -- 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
Aw: Re: [PATCH 1/2] Change old system name 'GIT' to 'Git'
> > If I were to decide today to change the spellings, with an explicit > purpose of making things more consistent across documentation, it > may make sense to use even a simpler rule that is less error-prone > for people who write new sentences that has to have the word. How > about treating it just like any other ordinary word? That is, we > say "git" (without double-quotes, of course), unless it comes at the > beginning of a sentence? > The widely used books on Git by Scott Chacon or Jon Loeliger (and many others) are using 'Git' instead of 'git' when talking about the whole system. So IMHO it would not be wise to change our internal documentation from using 'GIT'/'Git' to using 'git'. The internal documentation should be a natural continuation of these books by content and style. - Just my thoughts. --- Thomas -- 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 1/2] Change old system name 'GIT' to 'Git'
"Joachim Schmitz" writes: > Because then it could get confused with "git", the command? That would > be lower case even at the beginning of a sentence, wouldn't it? Is it a real-world problem? I think in a prose when you refer to "git" the command, you would say something like The `git` command started as a thin wrapper to many subcommand of the `git-subcmd` form. -- 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 1/2] Change old system name 'GIT' to 'Git'
Junio C Hamano wrote: David Aguilar writes: On Sat, Jan 19, 2013 at 1:59 AM, Thomas Ackermann wrote: @@ -55,7 +55,7 @@ History Viewers - *gitweb* (shipped with git-core) - GITweb provides full-fledged web interface for GIT repositories. + GITweb provides full-fledged web interface for Git repositories. What about GITweb? diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt index d377a35..0df13ff 100644 --- a/Documentation/git-update-ref.txt +++ b/Documentation/git-update-ref.txt @@ -73,7 +73,7 @@ in ref value. Log lines are formatted as: Where "oldsha1" is the 40 character hexadecimal value previously stored in , "newsha1" is the 40 character hexadecimal value of and "committer" is the committer's name, email address -and date in the standard GIT committer ident format. +and date in the standard Git committer ident format. IMO some of these look nicer when everything is lowercase. e.g. "standard git committer ident format". I do not think we ever intended to change the *name* of the software. In the early days, we wrote GIT in places where, if we were doing a fancier typography, we would have used drop-caps for the latter two (i.e. it is "Git" spelled in a font whose lower case alphabets have the same shape as upper case ones but are smaller). So there were only "git" vs "Git". If I were to decide today to change the spellings, with an explicit purpose of making things more consistent across documentation, it may make sense to use even a simpler rule that is less error-prone for people who write new sentences that has to have the word. How about treating it just like any other ordinary word? That is, we say "git" (without double-quotes, of course), unless it comes at the beginning of a sentence? Because then it could get confused with "git", the command? That would be lower case even at the beginning of a sentence, wouldn't it? Bye, Jojo -- 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 1/2] Change old system name 'GIT' to 'Git'
David Aguilar writes: > On Sat, Jan 19, 2013 at 1:59 AM, Thomas Ackermann wrote: >> @@ -55,7 +55,7 @@ History Viewers >> >> - *gitweb* (shipped with git-core) >> >> - GITweb provides full-fledged web interface for GIT repositories. >> + GITweb provides full-fledged web interface for Git repositories. > > What about GITweb? > >> diff --git a/Documentation/git-update-ref.txt >> b/Documentation/git-update-ref.txt >> index d377a35..0df13ff 100644 >> --- a/Documentation/git-update-ref.txt >> +++ b/Documentation/git-update-ref.txt >> @@ -73,7 +73,7 @@ in ref value. Log lines are formatted as: >> Where "oldsha1" is the 40 character hexadecimal value previously >> stored in , "newsha1" is the 40 character hexadecimal value of >> and "committer" is the committer's name, email address >> -and date in the standard GIT committer ident format. >> +and date in the standard Git committer ident format. > > IMO some of these look nicer when everything is lowercase. > e.g. "standard git committer ident format". I do not think we ever intended to change the *name* of the software. In the early days, we wrote GIT in places where, if we were doing a fancier typography, we would have used drop-caps for the latter two (i.e. it is "Git" spelled in a font whose lower case alphabets have the same shape as upper case ones but are smaller). So there were only "git" vs "Git". If I were to decide today to change the spellings, with an explicit purpose of making things more consistent across documentation, it may make sense to use even a simpler rule that is less error-prone for people who write new sentences that has to have the word. How about treating it just like any other ordinary word? That is, we say "git" (without double-quotes, of course), unless it comes at the beginning of a sentence? -- 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: Aw: Re: [PATCH 1/2] Change old system name 'GIT' to 'Git'
Thomas Ackermann writes: > The whole point of my patch is to use 'Git' consistently when > we are talking about the system and not the individual command. I like the idea. "git" should obviously remain lower-case when talking about the command, but deserves a capital when talking about the software independantly of whether it's called from command-line. Just like I type "firefox" in a shell to launch a program called "Firefox" (or even "Mozilla Firefox"). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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: Re: [PATCH 1/2] Change old system name 'GIT' to 'Git'
On Sat, Jan 19, 2013 at 7:01 AM, Thomas Ackermann wrote: > >> >> What about GITweb? >> > You are right; I missed that because I grepped only for 'GIT' as a whole word. > 'gitweb' and 'GITweb' should be changed to 'Gitweb'. > >> >> IMO some of these look nicer when everything is lowercase. >> e.g. "standard git committer ident format". >> > IMHO what seems nicer here is the spelling we are all accustomed to. > The whole point of my patch is to use 'Git' consistently when > we are talking about the system and not the individual command. > >> >> $ git grep 'git repositor' | wc -l >> 226 >> >> These changes touch, for example, git-clone.txt to make it >> say: "Make a 'bare' Git repository". Why not lowercase? >> > When you also apply my second patch you only get 17 occurences of "git > repository" > which I missed to change to 'Git repository' ... > > Thanks for looking into this! Thank *you* for tackling these last 226 and listening to my silly opinions. The end result will be much nicer all around. -- David -- 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
Aw: Re: [PATCH 1/2] Change old system name 'GIT' to 'Git'
> > What about GITweb? > You are right; I missed that because I grepped only for 'GIT' as a whole word. 'gitweb' and 'GITweb' should be changed to 'Gitweb'. > > IMO some of these look nicer when everything is lowercase. > e.g. "standard git committer ident format". > IMHO what seems nicer here is the spelling we are all accustomed to. The whole point of my patch is to use 'Git' consistently when we are talking about the system and not the individual command. > > $ git grep 'git repositor' | wc -l > 226 > > These changes touch, for example, git-clone.txt to make it > say: "Make a 'bare' Git repository". Why not lowercase? > When you also apply my second patch you only get 17 occurences of "git repository" which I missed to change to 'Git repository' ... Thanks for looking into this! --- Thomas -- 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 1/2] Change old system name 'GIT' to 'Git'
On Sat, Jan 19, 2013 at 1:59 AM, Thomas Ackermann wrote: > @@ -55,7 +55,7 @@ History Viewers > > - *gitweb* (shipped with git-core) > > - GITweb provides full-fledged web interface for GIT repositories. > + GITweb provides full-fledged web interface for Git repositories. What about GITweb? > diff --git a/Documentation/git-update-ref.txt > b/Documentation/git-update-ref.txt > index d377a35..0df13ff 100644 > --- a/Documentation/git-update-ref.txt > +++ b/Documentation/git-update-ref.txt > @@ -73,7 +73,7 @@ in ref value. Log lines are formatted as: > Where "oldsha1" is the 40 character hexadecimal value previously > stored in , "newsha1" is the 40 character hexadecimal value of > and "committer" is the committer's name, email address > -and date in the standard GIT committer ident format. > +and date in the standard Git committer ident format. IMO some of these look nicer when everything is lowercase. e.g. "standard git committer ident format". > diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt > index 168e8bf..d364c3a 100644 > --- a/Documentation/gitweb.txt > +++ b/Documentation/gitweb.txt > @@ -504,7 +504,7 @@ repositories, you can configure Apache like this: > > The above configuration expects your public repositories to live under > '/pub/git' and will serve them as `http://git.domain.org/dir-under-pub-git`, > -both as cloneable GIT URL and as browseable gitweb interface. If you then > +both as cloneable Git URL and as browseable gitweb interface. If you then > start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all` > then you can even use the `git://` URL with exactly the same path. Git but not Gitweb? IMO it reads nicer as "cloneable git URL", which also avoids this mismatch, but like I said that's my opinion. $ git grep 'git repositor' | wc -l 226 These changes touch, for example, git-clone.txt to make it say: "Make a 'bare' Git repository". Why not lowercase? In that same file it has "git repository", in lowercase, in a later paragraph. I'm not sure which way is preferred, but I think they should be consistent. Anyways, just some small notes. cheers, -- David -- 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
[PATCH 1/2] Change old system name 'GIT' to 'Git'
Signed-off-by: Thomas Ackermann
---
Documentation/asciidoc.conf | 2 +-
Documentation/everyday.txt | 4 ++--
Documentation/git-clone.txt | 2 +-
Documentation/git-cvsexportcommit.txt | 2 +-
Documentation/git-cvsserver.txt | 8
Documentation/git-daemon.txt| 4 ++--
Documentation/git-mv.txt| 2 +-
Documentation/git-send-email.txt| 2 +-
Documentation/git-tools.txt | 14 +++---
Documentation/git-update-ref.txt| 2 +-
Documentation/git.txt | 2 +-
Documentation/gitcore-tutorial.txt | 4 ++--
Documentation/gitglossary.txt | 2 +-
Documentation/gittutorial.txt | 2 +-
Documentation/gitweb.txt| 2 +-
Documentation/gitworkflows.txt | 2 +-
Documentation/glossary-content.txt | 2 +-
Documentation/howto-index.sh| 2 +-
Documentation/howto/rebase-from-internal-branch.txt | 6 +++---
Documentation/howto/revert-branch-rebase.txt| 4 ++--
Documentation/howto/setup-git-server-over-http.txt | 4 ++--
Documentation/technical/api-index-skel.txt | 4 ++--
Documentation/technical/index-format.txt| 6 +++---
Documentation/technical/pack-format.txt | 4 ++--
Documentation/user-manual.txt | 4 ++--
25 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 1273a85..2c16c53 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -4,7 +4,7 @@
#
# Note, {0} is the manpage section, while {target} is the command.
#
-# Show GIT link as: (); if section is defined, else just show
+# Show Git link as: (); if section is defined, else just show
# the command.
[macros]
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index 048337b..6acfd33 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -1,4 +1,4 @@
-Everyday GIT With 20 Commands Or So
+Everyday Git With 20 Commands Or So
===
<> commands are essential for
@@ -229,7 +229,7 @@ commands in addition to the ones needed by participants.
Examples
-My typical GIT day.::
+My typical Git day.::
+
$ git status <1>
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 7fefdb0..597048b 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -125,7 +125,7 @@ objects from the source repository into a pack in the
cloned repository.
No checkout of HEAD is performed after the clone is complete.
--bare::
- Make a 'bare' GIT repository. That is, instead of
+ Make a 'bare' Git repository. That is, instead of
creating `` and placing the administrative
files in `/.git`, make the ``
itself the `$GIT_DIR`. This obviously implies the `-n`
diff --git a/Documentation/git-cvsexportcommit.txt
b/Documentation/git-cvsexportcommit.txt
index 7f79cec..a671e22 100644
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -15,7 +15,7 @@ SYNOPSIS
DESCRIPTION
---
-Exports a commit from GIT to a CVS checkout, making it easier
+Exports a commit from Git to a CVS checkout, making it easier
to merge patches from a git repository into a CVS repository.
Specify the name of a CVS checkout using the -w switch or execute it
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 88d814a..36d069b 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -72,9 +72,9 @@ plugin. Most functionality works fine with both of these
clients.
LIMITATIONS
---
-CVS clients cannot tag, branch or perform GIT merges.
+CVS clients cannot tag, branch or perform Git merges.
-'git-cvsserver' maps GIT branches to CVS modules. This is very different
+'git-cvsserver' maps Git branches to CVS modules. This is very different
from what most CVS users would expect since in CVS modules usually represent
one or more directories.
@@ -130,7 +130,7 @@ Then provide your password via the pserver method, for
example:
--
cvs -d:pserver:someuser:somepassword server/path/repo.git co
--
-No special setup is needed for SSH access, other than having GIT tools
+No special setup is needed for SSH access, other than having Git tools
in the PATH. If you have clients that do not accept the CVS_SERVER
environment variable, you can rename 'git-cvsserver' to `cvs`.
@@ -197,7 +197,7 @@ allowing access over SSH.
shell is bash, .bashrc may be a reasonable alternative.
5. Clients should now be able to check out the project. Use t
