Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin committed
Jul 9, 2006 at 03:44 UTC
addf88e455f85bc6cfe0284b70aaad10b6d3486e
21 files changed
+34
-34
Documentation/SubmittingPatches
+1
-1
@@ -49,7 +49,7 @@ People on the git mailing list need to be able to read and
49
comment on the changes you are submitting. It is important for
50
a developer to be able to "quote" your changes, using standard
51
e-mail tools, so that they may comment on specific portions of
52
-your code. For this reason, all patches should be submited
52
+your code. For this reason, all patches should be submitted
53
"inline". WARNING: Be wary of your MUAs word-wrap
54
corrupting your patch. Do not cut-n-paste your patch; you can
55
lose tabs that way if you are not careful.
Documentation/cvs-migration.txt
+1
-1
@@ -93,7 +93,7 @@ machine where the repository is hosted. If you don't want to give them a
93
full shell on the machine, there is a restricted shell which only allows
94
users to do git pushes and pulls; see gitlink:git-shell[1].
95
96
-Put all the committers should in the same group, and make the repository
96
+Put all the committers in the same group, and make the repository
97
writable by that group:
98
99
------------------------------------------------
Documentation/git-diff-files.txt
+1
-1
@@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show "Unmerged".
37
commit with these flags.
38
39
-q::
40
- Remain silent even on nonexisting files
40
+ Remain silent even on nonexistent files
41
42
Output format
43
-------------
Documentation/git-init-db.txt
+1
-1
@@ -25,7 +25,7 @@ DESCRIPTION
25
-----------
26
This command creates an empty git repository - basically a `.git` directory
27
with subdirectories for `objects`, `refs/heads`, `refs/tags`, and
28
-templated files.
28
+template files.
29
An initial `HEAD` file that references the HEAD of the master branch
30
is also created.
31
Documentation/git-mailsplit.txt
+1
-1
@@ -25,7 +25,7 @@ OPTIONS
25
26
-b::
27
If any file doesn't begin with a From line, assume it is a
28
- single mail message instead of signalling error.
28
+ single mail message instead of signaling error.
29
30
-d<prec>::
31
Instead of the default 4 digits with leading zeros,
Documentation/git-merge.txt
+1
-1
@@ -83,7 +83,7 @@ your local modifications interfere with the merge, again, it
83
stops before touching anything.
84
85
So in the above two "failed merge" case, you do not have to
86
-worry about lossage of data --- you simply were not ready to do
86
+worry about loss of data --- you simply were not ready to do
87
a merge, so no merge happened at all. You may want to finish
88
whatever you were in the middle of doing, and retry the same
89
pull after you are done and ready.
Documentation/git-p4import.txt
+2
-2
@@ -128,7 +128,7 @@ Tags
128
A git tag of the form p4/xx is created for every change imported from
129
the Perforce repository where xx is the Perforce changeset number.
130
Therefore after the import you can use git to access any commit by its
131
-Perforce number, eg. git show p4/327.
131
+Perforce number, e.g. git show p4/327.
132
133
The tag associated with the HEAD commit is also how `git-p4import`
134
determines if there are new changes to incrementally import from the
@@ -143,7 +143,7 @@ may delete the tags.
143
144
Notes
145
-----
146
-You can interrupt the import (eg. ctrl-c) at any time and restart it
146
+You can interrupt the import (e.g. ctrl-c) at any time and restart it
147
without worry.
148
149
Author information is automatically determined by querying the
Documentation/git-pack-redundant.txt
+1
-1
@@ -29,7 +29,7 @@ OPTIONS
29
30
31
--all::
32
- Processes all packs. Any filenames on the commandline are ignored.
32
+ Processes all packs. Any filenames on the command line are ignored.
33
34
--alt-odb::
35
Don't require objects present in packs from alternate object
Documentation/git-push.txt
+1
-1
@@ -67,7 +67,7 @@ Some short-cut notations are also supported.
67
68
-f, \--force::
69
Usually, the command refuses to update a remote ref that is
70
- not a descendent of the local ref used to overwrite it.
70
+ not a descendant of the local ref used to overwrite it.
71
This flag disables the check. This can cause the
72
remote repository to lose commits; use it with care.
73
Documentation/git-repo-config.txt
+2
-2
@@ -119,8 +119,8 @@ you can set the filemode to true with
119
% git repo-config core.filemode true
120
------------
121
122
-The hypothetic proxy command entries actually have a postfix to discern
123
-to what URL they apply. Here is how to change the entry for kernel.org
122
+The hypothetical proxy command entries actually have a postfix to discern
123
+what URL they apply to. Here is how to change the entry for kernel.org
124
to "ssh".
125
126
------------
Documentation/git-rev-list.txt
+1
-1
@@ -64,7 +64,7 @@ OPTIONS
64
65
--objects-edge::
66
Similar to `--objects`, but also print the IDs of
67
- excluded commits refixed with a `-` character. This is
67
+ excluded commits prefixed with a `-` character. This is
68
used by `git-pack-objects` to build 'thin' pack, which
69
records objects in deltified form based on objects
70
contained in these excluded commits to reduce network
Documentation/git-tools.txt
+1
-1
@@ -42,7 +42,7 @@ History Viewers
42
43
- *gitk* (shipped with git-core)
44
45
- gitk is a simple TK GUI for browsing history of GIT repositories easily.
45
+ gitk is a simple Tk GUI for browsing history of GIT repositories easily.
46
47
48
- *gitview* (contrib/)
Documentation/git-upload-tar.txt
+1
-1
@@ -17,7 +17,7 @@ to the other end over the git protocol.
17
18
This command is usually not invoked directly by the end user.
19
The UI for the protocol is on the 'git-tar-tree' side, and the
20
-program pair is meant to be used to get a tar achive from a
20
+program pair is meant to be used to get a tar archive from a
21
remote repository.
22
23
Documentation/git.txt
+1
-1
@@ -478,7 +478,7 @@ Configuration Mechanism
478
479
Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
480
is used to hold per-repository configuration options. It is a
481
-simple text file modelled after `.ini` format familiar to some
481
+simple text file modeled after `.ini` format familiar to some
482
people. Here is an example:
483
484
------------
Documentation/howto/isolate-bugs-with-bisect.txt
+1
-1
@@ -28,7 +28,7 @@ Then do
28
29
and at this point "git bisect" will churn for a while, and tell you what
30
the mid-point between those two commits are, and check that state out as
31
-the head of the bew "bisect" branch.
31
+the head of the new "bisect" branch.
32
33
Compile and reboot.
34
Documentation/howto/rebase-from-internal-branch.txt
+1
-1
@@ -124,7 +124,7 @@ up your changes, along with other changes.
124
125
The two commits #2' and #3' in the above picture record the same
126
changes your e-mail submission for #2 and #3 contained, but
127
-probably with the new sign-off line added by the upsteam
127
+probably with the new sign-off line added by the upstream
128
maintainer and definitely with different committer and ancestry
129
information, they are different objects from #2 and #3 commits.
130
Documentation/technical/pack-heuristics.txt
+4
-4
@@ -73,7 +73,7 @@ The traditional insight:
73
74
<pasky> yes
75
76
-And Bable-like confusion flowed.
76
+And Babel-like confusion flowed.
77
78
<njs`> oh, hmm, and I'm not sure what this sliding window means either
79
@@ -257,7 +257,7 @@ proclaim it a non-issue. Good style too!
257
(type, basename, size)).
258
259
Then we walk through this list, and calculate a delta of
260
- each object against the last n (tunable paramater) objects,
260
+ each object against the last n (tunable parameter) objects,
261
and pick the smallest of these deltas.
262
263
Vastly simplified, but the essence is there!
@@ -395,7 +395,7 @@ used as setup for a later optimization, which is a real word:
395
do "object name->location in packfile" translation.
396
397
<njs`> I'm assuming the real win for delta-ing large->small is
398
- more homogenous statistics for gzip to run over?
398
+ more homogeneous statistics for gzip to run over?
399
400
(You have to put the bytes in one place or another, but
401
putting them in a larger blob wins on compression)
@@ -448,7 +448,7 @@ design options, etc.
448
449
Bugs happen, but they are "simple" bugs. And bugs that
450
actually get some object store detail wrong are almost always
451
- so obious that they never go anywhere.
451
+ so obvious that they never go anywhere.
452
453
<njs`> Yeah.
454
INSTALL
+2
-2
@@ -44,7 +44,7 @@ Issues of note:
44
45
- "libcurl" and "curl" executable. git-http-fetch and
46
git-fetch use them. If you do not use http
47
- transfer, you are probabaly OK if you do not have
47
+ transfer, you are probably OK if you do not have
48
them.
49
50
- expat library; git-http-push uses it for remote lock
@@ -69,7 +69,7 @@ Issues of note:
69
git, and if you only use git to track other peoples work you'll
70
never notice the lack of it.
71
72
- - "wish", the TCL/Tk windowing shell is used in gitk to show the
72
+ - "wish", the Tcl/Tk windowing shell is used in gitk to show the
73
history graphically
74
75
- "ssh" is used to push and pull over the net
Makefile
+2
-2
@@ -60,7 +60,7 @@ all:
60
# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
61
# a missing newline at the end of the file.
62
#
63
-# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
63
+# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
64
#
65
# Define COLLISION_CHECK below if you believe that SHA1's
66
# 1461501637330902918203684832716283019655932542976 hashes do not give you
@@ -469,7 +469,7 @@ ifdef NO_ACCURATE_DIFF
469
ALL_CFLAGS += -DNO_ACCURATE_DIFF
470
endif
471
472
-# Shell quote (do not use $(call) to accomodate ancient setups);
472
+# Shell quote (do not use $(call) to accommodate ancient setups);
473
474
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
475
git-cvsserver.perl
+7
-7
@@ -779,7 +779,7 @@ sub req_update
779
780
#$log->debug("update state : " . Dumper($state));
781
782
- # foreach file specified on the commandline ...
782
+ # foreach file specified on the command line ...
783
foreach my $filename ( @{$state->{args}} )
784
{
785
$filename = filecleanup($filename);
@@ -1031,7 +1031,7 @@ sub req_ci
1031
1032
my @committedfiles = ();
1033
1034
- # foreach file specified on the commandline ...
1034
+ # foreach file specified on the command line ...
1035
foreach my $filename ( @{$state->{args}} )
1036
{
1037
my $committedfile = $filename;
@@ -1145,7 +1145,7 @@ sub req_ci
1145
1146
$updater->update();
1147
1148
- # foreach file specified on the commandline ...
1148
+ # foreach file specified on the command line ...
1149
foreach my $filename ( @committedfiles )
1150
{
1151
$filename = filecleanup($filename);
@@ -1190,7 +1190,7 @@ sub req_status
1190
# if no files were specified, we need to work out what files we should be providing status on ...
1191
argsfromdir($updater);
1192
1193
- # foreach file specified on the commandline ...
1193
+ # foreach file specified on the command line ...
1194
foreach my $filename ( @{$state->{args}} )
1195
{
1196
$filename = filecleanup($filename);
@@ -1291,7 +1291,7 @@ sub req_diff
1291
# if no files were specified, we need to work out what files we should be providing status on ...
1292
argsfromdir($updater);
1293
1294
- # foreach file specified on the commandline ...
1294
+ # foreach file specified on the command line ...
1295
foreach my $filename ( @{$state->{args}} )
1296
{
1297
$filename = filecleanup($filename);
@@ -1433,7 +1433,7 @@ sub req_log
1433
# if no files were specified, we need to work out what files we should be providing status on ...
1434
argsfromdir($updater);
1435
1436
- # foreach file specified on the commandline ...
1436
+ # foreach file specified on the command line ...
1437
foreach my $filename ( @{$state->{args}} )
1438
{
1439
$filename = filecleanup($filename);
@@ -1519,7 +1519,7 @@ sub req_annotate
1519
1520
chdir $tmpdir;
1521
1522
- # foreach file specified on the commandline ...
1522
+ # foreach file specified on the command line ...
1523
foreach my $filename ( @{$state->{args}} )
1524
{
1525
$filename = filecleanup($filename);
server-info.c
+1
-1
@@ -94,7 +94,7 @@ static int read_pack_info_file(const char *infofile)
94
95
fp = fopen(infofile, "r");
96
if (!fp)
97
- return 1; /* nonexisting is not an error. */
97
+ return 1; /* nonexistent is not an error. */
98
99
while (fgets(line, sizeof(line), fp)) {
100
int len = strlen(line);