зеркало из https://github.com/microsoft/git.git
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
88f0d5d7d9
Коммит
addf88e455
|
@ -49,7 +49,7 @@ People on the git mailing list need to be able to read and
|
|||
comment on the changes you are submitting. It is important for
|
||||
a developer to be able to "quote" your changes, using standard
|
||||
e-mail tools, so that they may comment on specific portions of
|
||||
your code. For this reason, all patches should be submited
|
||||
your code. For this reason, all patches should be submitted
|
||||
"inline". WARNING: Be wary of your MUAs word-wrap
|
||||
corrupting your patch. Do not cut-n-paste your patch; you can
|
||||
lose tabs that way if you are not careful.
|
||||
|
|
|
@ -93,7 +93,7 @@ machine where the repository is hosted. If you don't want to give them a
|
|||
full shell on the machine, there is a restricted shell which only allows
|
||||
users to do git pushes and pulls; see gitlink:git-shell[1].
|
||||
|
||||
Put all the committers should in the same group, and make the repository
|
||||
Put all the committers in the same group, and make the repository
|
||||
writable by that group:
|
||||
|
||||
------------------------------------------------
|
||||
|
|
|
@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show "Unmerged".
|
|||
commit with these flags.
|
||||
|
||||
-q::
|
||||
Remain silent even on nonexisting files
|
||||
Remain silent even on nonexistent files
|
||||
|
||||
Output format
|
||||
-------------
|
||||
|
|
|
@ -25,7 +25,7 @@ DESCRIPTION
|
|||
-----------
|
||||
This command creates an empty git repository - basically a `.git` directory
|
||||
with subdirectories for `objects`, `refs/heads`, `refs/tags`, and
|
||||
templated files.
|
||||
template files.
|
||||
An initial `HEAD` file that references the HEAD of the master branch
|
||||
is also created.
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ OPTIONS
|
|||
|
||||
-b::
|
||||
If any file doesn't begin with a From line, assume it is a
|
||||
single mail message instead of signalling error.
|
||||
single mail message instead of signaling error.
|
||||
|
||||
-d<prec>::
|
||||
Instead of the default 4 digits with leading zeros,
|
||||
|
|
|
@ -83,7 +83,7 @@ your local modifications interfere with the merge, again, it
|
|||
stops before touching anything.
|
||||
|
||||
So in the above two "failed merge" case, you do not have to
|
||||
worry about lossage of data --- you simply were not ready to do
|
||||
worry about loss of data --- you simply were not ready to do
|
||||
a merge, so no merge happened at all. You may want to finish
|
||||
whatever you were in the middle of doing, and retry the same
|
||||
pull after you are done and ready.
|
||||
|
|
|
@ -128,7 +128,7 @@ Tags
|
|||
A git tag of the form p4/xx is created for every change imported from
|
||||
the Perforce repository where xx is the Perforce changeset number.
|
||||
Therefore after the import you can use git to access any commit by its
|
||||
Perforce number, eg. git show p4/327.
|
||||
Perforce number, e.g. git show p4/327.
|
||||
|
||||
The tag associated with the HEAD commit is also how `git-p4import`
|
||||
determines if there are new changes to incrementally import from the
|
||||
|
@ -143,7 +143,7 @@ may delete the tags.
|
|||
|
||||
Notes
|
||||
-----
|
||||
You can interrupt the import (eg. ctrl-c) at any time and restart it
|
||||
You can interrupt the import (e.g. ctrl-c) at any time and restart it
|
||||
without worry.
|
||||
|
||||
Author information is automatically determined by querying the
|
||||
|
|
|
@ -29,7 +29,7 @@ OPTIONS
|
|||
|
||||
|
||||
--all::
|
||||
Processes all packs. Any filenames on the commandline are ignored.
|
||||
Processes all packs. Any filenames on the command line are ignored.
|
||||
|
||||
--alt-odb::
|
||||
Don't require objects present in packs from alternate object
|
||||
|
|
|
@ -67,7 +67,7 @@ Some short-cut notations are also supported.
|
|||
|
||||
-f, \--force::
|
||||
Usually, the command refuses to update a remote ref that is
|
||||
not a descendent of the local ref used to overwrite it.
|
||||
not a descendant of the local ref used to overwrite it.
|
||||
This flag disables the check. This can cause the
|
||||
remote repository to lose commits; use it with care.
|
||||
|
||||
|
|
|
@ -119,8 +119,8 @@ you can set the filemode to true with
|
|||
% git repo-config core.filemode true
|
||||
------------
|
||||
|
||||
The hypothetic proxy command entries actually have a postfix to discern
|
||||
to what URL they apply. Here is how to change the entry for kernel.org
|
||||
The hypothetical proxy command entries actually have a postfix to discern
|
||||
what URL they apply to. Here is how to change the entry for kernel.org
|
||||
to "ssh".
|
||||
|
||||
------------
|
||||
|
|
|
@ -64,7 +64,7 @@ OPTIONS
|
|||
|
||||
--objects-edge::
|
||||
Similar to `--objects`, but also print the IDs of
|
||||
excluded commits refixed with a `-` character. This is
|
||||
excluded commits prefixed with a `-` character. This is
|
||||
used by `git-pack-objects` to build 'thin' pack, which
|
||||
records objects in deltified form based on objects
|
||||
contained in these excluded commits to reduce network
|
||||
|
|
|
@ -42,7 +42,7 @@ History Viewers
|
|||
|
||||
- *gitk* (shipped with git-core)
|
||||
|
||||
gitk is a simple TK GUI for browsing history of GIT repositories easily.
|
||||
gitk is a simple Tk GUI for browsing history of GIT repositories easily.
|
||||
|
||||
|
||||
- *gitview* (contrib/)
|
||||
|
|
|
@ -17,7 +17,7 @@ to the other end over the git protocol.
|
|||
|
||||
This command is usually not invoked directly by the end user.
|
||||
The UI for the protocol is on the 'git-tar-tree' side, and the
|
||||
program pair is meant to be used to get a tar achive from a
|
||||
program pair is meant to be used to get a tar archive from a
|
||||
remote repository.
|
||||
|
||||
|
||||
|
|
|
@ -478,7 +478,7 @@ Configuration Mechanism
|
|||
|
||||
Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
|
||||
is used to hold per-repository configuration options. It is a
|
||||
simple text file modelled after `.ini` format familiar to some
|
||||
simple text file modeled after `.ini` format familiar to some
|
||||
people. Here is an example:
|
||||
|
||||
------------
|
||||
|
|
|
@ -28,7 +28,7 @@ Then do
|
|||
|
||||
and at this point "git bisect" will churn for a while, and tell you what
|
||||
the mid-point between those two commits are, and check that state out as
|
||||
the head of the bew "bisect" branch.
|
||||
the head of the new "bisect" branch.
|
||||
|
||||
Compile and reboot.
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ up your changes, along with other changes.
|
|||
|
||||
The two commits #2' and #3' in the above picture record the same
|
||||
changes your e-mail submission for #2 and #3 contained, but
|
||||
probably with the new sign-off line added by the upsteam
|
||||
probably with the new sign-off line added by the upstream
|
||||
maintainer and definitely with different committer and ancestry
|
||||
information, they are different objects from #2 and #3 commits.
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ The traditional insight:
|
|||
|
||||
<pasky> yes
|
||||
|
||||
And Bable-like confusion flowed.
|
||||
And Babel-like confusion flowed.
|
||||
|
||||
<njs`> oh, hmm, and I'm not sure what this sliding window means either
|
||||
|
||||
|
@ -257,7 +257,7 @@ proclaim it a non-issue. Good style too!
|
|||
(type, basename, size)).
|
||||
|
||||
Then we walk through this list, and calculate a delta of
|
||||
each object against the last n (tunable paramater) objects,
|
||||
each object against the last n (tunable parameter) objects,
|
||||
and pick the smallest of these deltas.
|
||||
|
||||
Vastly simplified, but the essence is there!
|
||||
|
@ -395,7 +395,7 @@ used as setup for a later optimization, which is a real word:
|
|||
do "object name->location in packfile" translation.
|
||||
|
||||
<njs`> I'm assuming the real win for delta-ing large->small is
|
||||
more homogenous statistics for gzip to run over?
|
||||
more homogeneous statistics for gzip to run over?
|
||||
|
||||
(You have to put the bytes in one place or another, but
|
||||
putting them in a larger blob wins on compression)
|
||||
|
@ -448,7 +448,7 @@ design options, etc.
|
|||
|
||||
Bugs happen, but they are "simple" bugs. And bugs that
|
||||
actually get some object store detail wrong are almost always
|
||||
so obious that they never go anywhere.
|
||||
so obvious that they never go anywhere.
|
||||
|
||||
<njs`> Yeah.
|
||||
|
||||
|
|
4
INSTALL
4
INSTALL
|
@ -44,7 +44,7 @@ Issues of note:
|
|||
|
||||
- "libcurl" and "curl" executable. git-http-fetch and
|
||||
git-fetch use them. If you do not use http
|
||||
transfer, you are probabaly OK if you do not have
|
||||
transfer, you are probably OK if you do not have
|
||||
them.
|
||||
|
||||
- expat library; git-http-push uses it for remote lock
|
||||
|
@ -69,7 +69,7 @@ Issues of note:
|
|||
git, and if you only use git to track other peoples work you'll
|
||||
never notice the lack of it.
|
||||
|
||||
- "wish", the TCL/Tk windowing shell is used in gitk to show the
|
||||
- "wish", the Tcl/Tk windowing shell is used in gitk to show the
|
||||
history graphically
|
||||
|
||||
- "ssh" is used to push and pull over the net
|
||||
|
|
4
Makefile
4
Makefile
|
@ -60,7 +60,7 @@ all:
|
|||
# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
|
||||
# a missing newline at the end of the file.
|
||||
#
|
||||
# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
|
||||
# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
|
||||
#
|
||||
# Define COLLISION_CHECK below if you believe that SHA1's
|
||||
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
||||
|
@ -469,7 +469,7 @@ ifdef NO_ACCURATE_DIFF
|
|||
ALL_CFLAGS += -DNO_ACCURATE_DIFF
|
||||
endif
|
||||
|
||||
# Shell quote (do not use $(call) to accomodate ancient setups);
|
||||
# Shell quote (do not use $(call) to accommodate ancient setups);
|
||||
|
||||
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
|
||||
|
||||
|
|
|
@ -779,7 +779,7 @@ sub req_update
|
|||
|
||||
#$log->debug("update state : " . Dumper($state));
|
||||
|
||||
# foreach file specified on the commandline ...
|
||||
# foreach file specified on the command line ...
|
||||
foreach my $filename ( @{$state->{args}} )
|
||||
{
|
||||
$filename = filecleanup($filename);
|
||||
|
@ -1031,7 +1031,7 @@ sub req_ci
|
|||
|
||||
my @committedfiles = ();
|
||||
|
||||
# foreach file specified on the commandline ...
|
||||
# foreach file specified on the command line ...
|
||||
foreach my $filename ( @{$state->{args}} )
|
||||
{
|
||||
my $committedfile = $filename;
|
||||
|
@ -1145,7 +1145,7 @@ sub req_ci
|
|||
|
||||
$updater->update();
|
||||
|
||||
# foreach file specified on the commandline ...
|
||||
# foreach file specified on the command line ...
|
||||
foreach my $filename ( @committedfiles )
|
||||
{
|
||||
$filename = filecleanup($filename);
|
||||
|
@ -1190,7 +1190,7 @@ sub req_status
|
|||
# if no files were specified, we need to work out what files we should be providing status on ...
|
||||
argsfromdir($updater);
|
||||
|
||||
# foreach file specified on the commandline ...
|
||||
# foreach file specified on the command line ...
|
||||
foreach my $filename ( @{$state->{args}} )
|
||||
{
|
||||
$filename = filecleanup($filename);
|
||||
|
@ -1291,7 +1291,7 @@ sub req_diff
|
|||
# if no files were specified, we need to work out what files we should be providing status on ...
|
||||
argsfromdir($updater);
|
||||
|
||||
# foreach file specified on the commandline ...
|
||||
# foreach file specified on the command line ...
|
||||
foreach my $filename ( @{$state->{args}} )
|
||||
{
|
||||
$filename = filecleanup($filename);
|
||||
|
@ -1433,7 +1433,7 @@ sub req_log
|
|||
# if no files were specified, we need to work out what files we should be providing status on ...
|
||||
argsfromdir($updater);
|
||||
|
||||
# foreach file specified on the commandline ...
|
||||
# foreach file specified on the command line ...
|
||||
foreach my $filename ( @{$state->{args}} )
|
||||
{
|
||||
$filename = filecleanup($filename);
|
||||
|
@ -1519,7 +1519,7 @@ sub req_annotate
|
|||
|
||||
chdir $tmpdir;
|
||||
|
||||
# foreach file specified on the commandline ...
|
||||
# foreach file specified on the command line ...
|
||||
foreach my $filename ( @{$state->{args}} )
|
||||
{
|
||||
$filename = filecleanup($filename);
|
||||
|
|
|
@ -94,7 +94,7 @@ static int read_pack_info_file(const char *infofile)
|
|||
|
||||
fp = fopen(infofile, "r");
|
||||
if (!fp)
|
||||
return 1; /* nonexisting is not an error. */
|
||||
return 1; /* nonexistent is not an error. */
|
||||
|
||||
while (fgets(line, sizeof(line), fp)) {
|
||||
int len = strlen(line);
|
||||
|
|
Загрузка…
Ссылка в новой задаче