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>
Christian Meder committed
Oct 10, 2005 at 16:01 UTC
72e9340cfde90189d76ef3c8a4793ea7764ff8ee
24 files changed
+55
-55
Documentation/cvs-migration.txt
+7
-7
@@ -1,4 +1,4 @@
1
-Git for CVS users
1
+git for CVS users
2
=================
3
4
Ok, so you're a CVS user. That's ok, it's a treatable condition, and the
@@ -7,7 +7,7 @@ you are reading this file means that you may be well on that path
7
already.
8
9
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,
11
however, may be a bit 'too' different (read: "good") for your taste, and
12
does a lot of things differently.
13
@@ -15,7 +15,7 @@ One particular suckage of CVS is very hard to work around: CVS is
15
basically a tool for tracking 'file' history, while git is a tool for
16
tracking 'project' history. This sometimes causes problems if you are
17
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
19
track that, since git never tracks things on the level of an individual
20
file, only on the whole project level.
21
@@ -32,7 +32,7 @@ and notes on converting from CVS to git.
32
33
Second: CVS has the notion of a "repository" as opposed to the thing
34
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
36
working directories 'are' the repositories. However, you can easily
37
emulate the CVS model by having one special "global repository", which
38
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
49
how to commit stuff etc in git) is to create a git'ified version of your
50
CVS archive.
51
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
53
will need the help of a program called "cvsps":
54
55
http://www.cobite.com/cvsps/
@@ -135,7 +135,7 @@ technically possible, and there are at least two specialized scripts out
135
there that can be used to get equivalent information (see the git
136
mailing list archives for details).
137
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
139
or even superior depending on your use. One is called "git-whatchanged"
140
(for obvious reasons) and the other one is called "pickaxe" ("a tool for
141
the software archeologist").
@@ -208,7 +208,7 @@ show anything for commits that do not touch this "if" statement.
208
Also, in the original context, the same statement might have
209
appeared at first in a different file and later the file was
210
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
212
a situation. For that, you can give the -C flag to
213
git-diff-tree, like this:
214
Documentation/diff-format.txt
+1
-1
@@ -106,7 +106,7 @@ For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
106
parameter, <path>.
107
108
109
-Git specific extension to diff format
109
+git specific extension to diff format
110
-------------------------------------
111
112
What -p option produces is slightly different from the
Documentation/diffcore.txt
+1
-1
@@ -250,7 +250,7 @@ pattern. Filepairs that match a glob pattern on an earlier line
250
in the file are output before ones that match a later line, and
251
filepairs that do not match any glob pattern are output last.
252
253
-As an example, typical orderfile for the core GIT probably
253
+As an example, typical orderfile for the core git probably
254
would look like this:
255
256
------------------------------------------------
Documentation/git-apply.txt
+1
-1
@@ -3,7 +3,7 @@ git-apply(1)
3
4
NAME
5
----
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
7
8
9
SYNOPSIS
Documentation/git-archimport.txt
+4
-4
@@ -3,7 +3,7 @@ git-archimport(1)
3
4
NAME
5
----
6
-git-archimport - Import an Arch repository into GIT
6
+git-archimport - Import an Arch repository into git
7
8
9
SYNOPSIS
@@ -40,14 +40,14 @@ incremental imports.
40
41
MERGES
42
------
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
44
does not care much about tracking patches, and only considers a merge when a
45
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
47
import process does lose some patch-trading metadata.
48
49
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
51
patches that have been traded out-of-sequence between the branches.
52
53
OPTIONS
Documentation/git-clone-pack.txt
+1
-1
@@ -28,7 +28,7 @@ OPTIONS
28
remote side, if it is not found on your $PATH.
29
Installations of sshd ignore the user's environment
30
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
32
default $PATH. Another workaround suggested is to set
33
up your $PATH in ".bashrc", but this flag is for people
34
who do not want to pay the overhead for non-interactive
Documentation/git-convert-objects.txt
+2
-2
@@ -3,7 +3,7 @@ git-convert-objects(1)
3
4
NAME
5
----
6
-git-convert-objects - Converts old-style GIT repository
6
+git-convert-objects - Converts old-style git repository
7
8
9
SYNOPSIS
@@ -12,7 +12,7 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
-Converts old-style GIT repository to the latest format
15
+Converts old-style git repository to the latest format
16
17
18
Author
Documentation/git-cvsimport.txt
+2
-2
@@ -10,7 +10,7 @@ SYNOPSIS
10
--------
11
'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
12
[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
13
- [ -C <GIT_repository> ] [ -i ] [ -k ]
13
+ [ -C <git_repository> ] [ -i ] [ -k ]
14
[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
15
16
@@ -30,7 +30,7 @@ OPTIONS
30
are supported.
31
32
-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
34
exist, it will be created. Default is the current directory.
35
36
-i::
Documentation/git-daemon.txt
+1
-1
@@ -3,7 +3,7 @@ git-daemon(1)
3
4
NAME
5
----
6
-git-daemon - A really simple server for GIT repositories.
6
+git-daemon - A really simple server for git repositories.
7
8
SYNOPSIS
9
--------
Documentation/git-fetch-pack.txt
+1
-1
@@ -34,7 +34,7 @@ OPTIONS
34
remote side, if is not found on your $PATH.
35
Installations of sshd ignores the user's environment
36
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
38
default $PATH. Another workaround suggested is to set
39
up your $PATH in ".bashrc", but this flag is for people
40
who do not want to pay the overhead for non-interactive
Documentation/git-fsck-objects.txt
+5
-5
@@ -41,22 +41,22 @@ index file and all SHA1 references in .git/refs/* as heads.
41
($GIT_DIR/objects), making sure that it is consistent and
42
complete without referring to objects found in alternate
43
object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES,
44
- nor packed GIT archives found in $GIT_DIR/objects/pack;
44
+ nor packed git archives found in $GIT_DIR/objects/pack;
45
cannot be used with --full.
46
47
--full::
48
Check not just objects in GIT_OBJECT_DIRECTORY
49
($GIT_DIR/objects), but also the ones found in alternate
50
object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES,
51
- and in packed GIT archives found in $GIT_DIR/objects/pack
51
+ and in packed git archives found in $GIT_DIR/objects/pack
52
and corresponding pack subdirectories in alternate
53
object pools; cannot be used with --standalone.
54
55
--strict::
56
Enable more strict checking, namely to catch a file mode
57
recorded with g+w bit set, which was created by older
58
- versions of GIT. Existing repositories, including the
59
- Linux kernel, GIT itself, and sparse repository have old
58
+ versions of git. Existing repositories, including the
59
+ Linux kernel, git itself, and sparse repository have old
60
objects that triggers this check, but it is recommended
61
to check new projects with this flag.
62
@@ -80,7 +80,7 @@ Any corrupt objects you will have to find in backups or other archives
80
the hopes that somebody else has the object you have corrupted).
81
82
Of course, "valid tree" doesn't mean that it wasn't generated by some
83
-evil person, and the end result might be crap. Git is a revision
83
+evil person, and the end result might be crap. git is a revision
84
tracking system, not a quality assurance system ;)
85
86
Extracted Diagnostics
Documentation/git-http-fetch.txt
+2
-2
@@ -3,7 +3,7 @@ git-http-fetch(1)
3
4
NAME
5
----
6
-git-http-fetch - Downloads a remote GIT repository via HTTP
6
+git-http-fetch - Downloads a remote git repository via HTTP
7
8
9
SYNOPSIS
@@ -12,7 +12,7 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
-Downloads a remote GIT repository via HTTP.
15
+Downloads a remote git repository via HTTP.
16
17
-c::
18
Get the commit objects.
Documentation/git-local-fetch.txt
+2
-2
@@ -3,7 +3,7 @@ git-local-fetch(1)
3
4
NAME
5
----
6
-git-local-fetch - Duplicates another GIT repository on a local system
6
+git-local-fetch - Duplicates another git repository on a local system
7
8
9
SYNOPSIS
@@ -12,7 +12,7 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
-Duplicates another GIT repository on a local system.
15
+Duplicates another git repository on a local system.
16
17
OPTIONS
18
-------
Documentation/git-pack-objects.txt
+1
-1
@@ -30,7 +30,7 @@ transport by their peers.
30
31
Placing both in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or
32
any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES)
33
-enables GIT to read from such an archive.
33
+enables git to read from such an archive.
34
35
36
OPTIONS
Documentation/git-peek-remote.txt
+1
-1
@@ -22,7 +22,7 @@ OPTIONS
22
remote side, if it is not found on your $PATH. Some
23
installations of sshd ignores the user's environment
24
setup scripts for login shells (e.g. .bash_profile) and
25
- your privately installed GIT may not be found on the system
25
+ your privately installed git may not be found on the system
26
default $PATH. Another workaround suggested is to set
27
up your $PATH in ".bashrc", but this flag is for people
28
who do not want to pay the overhead for non-interactive
Documentation/git-rev-parse.txt
+1
-1
@@ -91,7 +91,7 @@ what is called an 'extended SHA1' syntax.
91
* A symbolic ref name. E.g. 'master' typically means the commit
92
object referenced by $GIT_DIR/refs/heads/master. If you
93
happen to have both heads/master and tags/master, you can
94
- explicitly say 'heads/master' to tell GIT which one you mean.
94
+ explicitly say 'heads/master' to tell git which one you mean.
95
96
* A suffix '{caret}' to a revision parameter means the first parent of
97
that commit object. '{caret}<n>' means the <n>th parent (i.e.
Documentation/git-show-index.txt
+1
-1
@@ -13,7 +13,7 @@ SYNOPSIS
13
14
DESCRIPTION
15
-----------
16
-Reads given idx file for packed GIT archive created with
16
+Reads given idx file for packed git archive created with
17
git-pack-objects command, and dumps its contents.
18
19
The information it outputs is subset of what you can get from
Documentation/git-verify-pack.txt
+2
-2
@@ -3,7 +3,7 @@ git-verify-pack(1)
3
4
NAME
5
----
6
-git-verify-pack - Validate packed GIT archive files.
6
+git-verify-pack - Validate packed git archive files.
7
8
9
SYNOPSIS
@@ -13,7 +13,7 @@ SYNOPSIS
13
14
DESCRIPTION
15
-----------
16
-Reads given idx file for packed GIT archive created with
16
+Reads given idx file for packed git archive created with
17
git-pack-objects command and verifies idx file and the
18
corresponding pack file.
19
Documentation/git.txt
+5
-5
@@ -146,7 +146,7 @@ gitlink:git-var[1]::
146
Displays a git logical variable
147
148
gitlink:git-verify-pack[1]::
149
- Validates packed GIT archive files
149
+ Validates packed git archive files
150
151
The interrogate commands may create files - and you can force them to
152
touch the working file set - but in general they don't
@@ -163,11 +163,11 @@ gitlink:git-fetch-pack[1]::
163
Updates from a remote repository.
164
165
gitlink:git-http-fetch[1]::
166
- Downloads a remote GIT repository via HTTP
166
+ Downloads a remote git repository via HTTP
167
Previously this command was known as git-http-pull.
168
169
gitlink:git-local-fetch[1]::
170
- Duplicates another GIT repository on a local system
170
+ Duplicates another git repository on a local system
171
Previously this command was known as git-local-pull.
172
173
gitlink:git-peek-remote[1]::
@@ -322,7 +322,7 @@ gitlink:git-archimport[1]::
322
Previously this command was known as git-archimport-script.
323
324
gitlink:git-convert-objects[1]::
325
- Converts old-style GIT repository
325
+ Converts old-style git repository
326
Previously this command was known as git-convert-cache.
327
328
gitlink:git-cvsimport[1]::
@@ -360,7 +360,7 @@ gitlink:git-count-objects[1]::
360
Previously this command was known as git-count-objects-script.
361
362
gitlink:git-daemon[1]::
363
- A really simple server for GIT repositories.
363
+ A really simple server for git repositories.
364
365
gitlink:git-get-tar-commit-id[1]::
366
Extract commit ID from an archive created using git-tar-tree.
Documentation/glossary.txt
+1
-1
@@ -1,5 +1,5 @@
1
object::
2
- The unit of storage in GIT. It is uniquely identified by
2
+ The unit of storage in git. It is uniquely identified by
3
the SHA1 of its contents. Consequently, an object can not
4
be changed.
5
Documentation/hooks.txt
+1
-1
@@ -1,4 +1,4 @@
1
-Hooks used by GIT
1
+Hooks used by git
2
=================
3
4
Hooks are little scripts you can place in `$GIT_DIR/hooks`
Documentation/pull-fetch-param.txt
+1
-1
@@ -6,7 +6,7 @@
6
===============================================================
7
- Rsync URL: rsync://remote.machine/path/to/repo.git/
8
- HTTP(s) URL: http://remote.machine/path/to/repo.git/
9
-- GIT URL: git://remote.machine/path/to/repo.git/
9
+- git URL: git://remote.machine/path/to/repo.git/
10
or remote.machine:/path/to/repo.git/
11
- Local directory: /path/to/repo.git/
12
===============================================================
Documentation/repository-layout.txt
+2
-2
@@ -1,4 +1,4 @@
1
-GIT repository layout
1
+git repository layout
2
=====================
3
4
You may find these things in your git repository (`.git`
@@ -119,7 +119,7 @@ info/grafts::
119
info/exclude::
120
This file, by convention among Porcelains, stores the
121
exclude pattern list. `git status` looks at it, but
122
- otherwise it is not looked at by any of the core GIT
122
+ otherwise it is not looked at by any of the core git
123
commands.
124
125
remotes::
Documentation/tutorial.txt
+9
-9
@@ -160,7 +160,7 @@ you'll have to use the object name, not the filename of the object:
160
git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238
161
162
where the `-t` tells `git-cat-file` to tell you what the "type" of the
163
-object is. Git will tell you that you have a "blob" object (ie just a
163
+object is. git will tell you that you have a "blob" object (ie just a
164
regular file), and you can see the contents with
165
166
git-cat-file "blob" 557db03
@@ -377,7 +377,7 @@ come from the working tree or not.
377
378
This is not hard to understand, as soon as you realize that git simply
379
never knows (or cares) about files that it is not told about
380
-explicitly. Git will never go *looking* for files to compare, it
380
+explicitly. git will never go *looking* for files to compare, it
381
expects you to tell it what the files are, and that's what the index
382
is there for.
383
================
@@ -543,7 +543,7 @@ name for the state at that point.
543
Copying repositories
544
--------------------
545
546
-Git repositories are normally totally self-sufficient, and it's worth noting
546
+git repositories are normally totally self-sufficient, and it's worth noting
547
that unlike CVS, for example, there is no separate notion of
548
"repository" and "working tree". A git repository normally *is* the
549
working tree, with the local git information hidden in the `.git`
@@ -950,7 +950,7 @@ This transport is the same as SSH transport but uses `sh` to run
950
both ends on the local machine instead of running other end on
951
the remote machine via `ssh`.
952
953
-GIT Native::
953
+git Native::
954
`git://remote.machine/path/to/repo.git/`
955
+
956
This transport was designed for anonymous downloading. Like SSH
@@ -971,13 +971,13 @@ necessary objects. Because of this behaviour, they are
971
sometimes also called 'commit walkers'.
972
+
973
The 'commit walkers' are sometimes also called 'dumb
974
-transports', because they do not require any GIT aware smart
975
-server like GIT Native transport does. Any stock HTTP server
974
+transports', because they do not require any git aware smart
975
+server like git Native transport does. Any stock HTTP server
976
would suffice.
977
+
978
There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload`
979
programs, which are 'commit walkers'; they outlived their
980
-usefulness when GIT Native and SSH transports were introduced,
980
+usefulness when git Native and SSH transports were introduced,
981
and not used by `git pull` or `git push` scripts.
982
983
Once you fetch from the remote repository, you `resolve` that
@@ -1081,7 +1081,7 @@ done only once.
1081
on the remote machine. The communication between the two over
1082
the network internally uses an SSH connection.
1083
1084
-Your private repository's GIT directory is usually `.git`, but
1084
+Your private repository's git directory is usually `.git`, but
1085
your public repository is often named after the project name,
1086
i.e. `<project>.git`. Let's create such a public repository for
1087
project `my-git`. After logging into the remote machine, create
@@ -1089,7 +1089,7 @@ an empty directory:
1089
1090
mkdir my-git.git
1091
1092
-Then, make that directory into a GIT repository by running
1092
+Then, make that directory into a git repository by running
1093
`git init-db`, but this time, since its name is not the usual
1094
`.git`, we do things slightly differently:
1095