X Tutup
Skip to content

Commit 72e9340

Browse files
Christian MederJunio C Hamano
authored andcommitted
Convert usage of GIT and Git into git
Convert usage of GIT and Git into git. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 98438bd commit 72e9340

24 files changed

+55
-55
lines changed

Documentation/cvs-migration.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Git for CVS users
1+
git for CVS users
22
=================
33

44
Ok, so you're a CVS user. That's ok, it's a treatable condition, and the
@@ -7,15 +7,15 @@ you are reading this file means that you may be well on that path
77
already.
88

99
The thing about CVS is that it absolutely sucks as a source control
10-
manager, and you'll thus be happy with almost anything else. Git,
10+
manager, and you'll thus be happy with almost anything else. git,
1111
however, may be a bit 'too' different (read: "good") for your taste, and
1212
does a lot of things differently.
1313

1414
One particular suckage of CVS is very hard to work around: CVS is
1515
basically a tool for tracking 'file' history, while git is a tool for
1616
tracking 'project' history. This sometimes causes problems if you are
1717
used to doing very strange things in CVS, in particular if you're doing
18-
things like making branches of just a subset of the project. Git can't
18+
things like making branches of just a subset of the project. git can't
1919
track that, since git never tracks things on the level of an individual
2020
file, only on the whole project level.
2121

@@ -32,7 +32,7 @@ and notes on converting from CVS to git.
3232

3333
Second: CVS has the notion of a "repository" as opposed to the thing
3434
that you're actually working in (your working directory, or your
35-
"checked out tree"). Git does not have that notion at all, and all git
35+
"checked out tree"). git does not have that notion at all, and all git
3636
working directories 'are' the repositories. However, you can easily
3737
emulate the CVS model by having one special "global repository", which
3838
people can synchronize with. See details later, but in the meantime
@@ -49,7 +49,7 @@ gone through the git tutorial, and generally familiarized yourself with
4949
how to commit stuff etc in git) is to create a git'ified version of your
5050
CVS archive.
5151

52-
Happily, that's very easy indeed. Git will do it for you, although git
52+
Happily, that's very easy indeed. git will do it for you, although git
5353
will need the help of a program called "cvsps":
5454

5555
http://www.cobite.com/cvsps/
@@ -135,7 +135,7 @@ technically possible, and there are at least two specialized scripts out
135135
there that can be used to get equivalent information (see the git
136136
mailing list archives for details).
137137

138-
Git has a couple of alternatives, though, that you may find sufficient
138+
git has a couple of alternatives, though, that you may find sufficient
139139
or even superior depending on your use. One is called "git-whatchanged"
140140
(for obvious reasons) and the other one is called "pickaxe" ("a tool for
141141
the software archeologist").
@@ -208,7 +208,7 @@ show anything for commits that do not touch this "if" statement.
208208
Also, in the original context, the same statement might have
209209
appeared at first in a different file and later the file was
210210
renamed to "a-file.c". CVS annotate would not help you to go
211-
back across such a rename, but GIT would still help you in such
211+
back across such a rename, but git would still help you in such
212212
a situation. For that, you can give the -C flag to
213213
git-diff-tree, like this:
214214

Documentation/diff-format.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
106106
parameter, <path>.
107107

108108

109-
Git specific extension to diff format
109+
git specific extension to diff format
110110
-------------------------------------
111111

112112
What -p option produces is slightly different from the

Documentation/diffcore.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ pattern. Filepairs that match a glob pattern on an earlier line
250250
in the file are output before ones that match a later line, and
251251
filepairs that do not match any glob pattern are output last.
252252

253-
As an example, typical orderfile for the core GIT probably
253+
As an example, typical orderfile for the core git probably
254254
would look like this:
255255

256256
------------------------------------------------

Documentation/git-apply.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ git-apply(1)
33

44
NAME
55
----
6-
git-apply - Apply patch on a GIT index file and a work tree
6+
git-apply - Apply patch on a git index file and a work tree
77

88

99
SYNOPSIS

Documentation/git-archimport.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ git-archimport(1)
33

44
NAME
55
----
6-
git-archimport - Import an Arch repository into GIT
6+
git-archimport - Import an Arch repository into git
77

88

99
SYNOPSIS
@@ -40,14 +40,14 @@ incremental imports.
4040

4141
MERGES
4242
------
43-
Patch merge data from Arch is used to mark merges in GIT as well. GIT
43+
Patch merge data from Arch is used to mark merges in git as well. git
4444
does not care much about tracking patches, and only considers a merge when a
4545
branch incorporates all the commits since the point they forked. The end result
46-
is that GIT will have a good idea of how far branches have diverged. So the
46+
is that git will have a good idea of how far branches have diverged. So the
4747
import process does lose some patch-trading metadata.
4848

4949
Fortunately, when you try and merge branches imported from Arch,
50-
GIT will find a good merge base, and it has a good chance of identifying
50+
git will find a good merge base, and it has a good chance of identifying
5151
patches that have been traded out-of-sequence between the branches.
5252

5353
OPTIONS

Documentation/git-clone-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ OPTIONS
2828
remote side, if it is not found on your $PATH.
2929
Installations of sshd ignore the user's environment
3030
setup scripts for login shells (e.g. .bash_profile) and
31-
your privately installed GIT may not be found on the system
31+
your privately installed git may not be found on the system
3232
default $PATH. Another workaround suggested is to set
3333
up your $PATH in ".bashrc", but this flag is for people
3434
who do not want to pay the overhead for non-interactive

Documentation/git-convert-objects.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ git-convert-objects(1)
33

44
NAME
55
----
6-
git-convert-objects - Converts old-style GIT repository
6+
git-convert-objects - Converts old-style git repository
77

88

99
SYNOPSIS
@@ -12,7 +12,7 @@ SYNOPSIS
1212

1313
DESCRIPTION
1414
-----------
15-
Converts old-style GIT repository to the latest format
15+
Converts old-style git repository to the latest format
1616

1717

1818
Author

Documentation/git-cvsimport.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SYNOPSIS
1010
--------
1111
'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
1212
[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
13-
[ -C <GIT_repository> ] [ -i ] [ -k ]
13+
[ -C <git_repository> ] [ -i ] [ -k ]
1414
[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
1515

1616

@@ -30,7 +30,7 @@ OPTIONS
3030
are supported.
3131

3232
-C <target-dir>::
33-
The GIT repository to import to. If the directory doesn't
33+
The git repository to import to. If the directory doesn't
3434
exist, it will be created. Default is the current directory.
3535

3636
-i::

Documentation/git-daemon.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ git-daemon(1)
33

44
NAME
55
----
6-
git-daemon - A really simple server for GIT repositories.
6+
git-daemon - A really simple server for git repositories.
77

88
SYNOPSIS
99
--------

Documentation/git-fetch-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ OPTIONS
3434
remote side, if is not found on your $PATH.
3535
Installations of sshd ignores the user's environment
3636
setup scripts for login shells (e.g. .bash_profile) and
37-
your privately installed GIT may not be found on the system
37+
your privately installed git may not be found on the system
3838
default $PATH. Another workaround suggested is to set
3939
up your $PATH in ".bashrc", but this flag is for people
4040
who do not want to pay the overhead for non-interactive

0 commit comments

Comments
 (0)
X Tutup