mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some typos, punctuation, missing words, minor markup.

Browse Source 
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Ralf Wildenhues
2007-10-09 23:00:03 +02:00
committed by Shawn O. Pearce
parent 2ef8ac1b2a
commit 06ada1529c
10 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.txt
View File

@ -188,7 +188,7 @@ core.worktree::
Set the path to the working tree. The value will not be Set the path to the working tree. The value will not be
used in combination with repositories found automatically in used in combination with repositories found automatically in
a .git directory (i.e. $GIT_DIR is not set). a .git directory (i.e. $GIT_DIR is not set).
This can be overriden by the GIT_WORK_TREE environment This can be overridden by the GIT_WORK_TREE environment
variable and the '--work-tree' command line option. variable and the '--work-tree' command line option.
core.logAllRefUpdates:: core.logAllRefUpdates::
@ -607,7 +607,7 @@ merge.verbosity::
message if conflicts were detected. Level 1 outputs only message if conflicts were detected. Level 1 outputs only
conflicts, 2 outputs conflicts and file changes. Level 5 and conflicts, 2 outputs conflicts and file changes. Level 5 and
above outputs debugging information. The default is level 2. above outputs debugging information. The default is level 2.
Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
merge.<driver>.name:: merge.<driver>.name::
Defines a human readable name for a custom low-level Defines a human readable name for a custom low-level

2
Documentation/git-diff.txt
View File

@ -125,7 +125,7 @@ $ git diff topic...master <3>
+ +
<1> Changes between the tips of the topic and the master branches. <1> Changes between the tips of the topic and the master branches.
<2> Same as above. <2> Same as above.
<3> Changes that occured on the master branch since when the topic <3> Changes that occurred on the master branch since when the topic
branch was started off it. branch was started off it.
Limiting the diff output:: Limiting the diff output::

2
Documentation/git-index-pack.txt
View File

@ -43,7 +43,7 @@ OPTIONS
a default name determined from the pack content. If a default name determined from the pack content. If
<pack-file> is not specified consider using --keep to <pack-file> is not specified consider using --keep to
prevent a race condition between this process and prevent a race condition between this process and
gitlink::git-repack[1] . gitlink::git-repack[1].
--fix-thin:: --fix-thin::
It is possible for gitlink:git-pack-objects[1] to build It is possible for gitlink:git-pack-objects[1] to build

2
Documentation/git-merge-index.txt
View File

@ -40,7 +40,7 @@ If "git-merge-index" is called with multiple <file>s (or -a) then it
processes them in turn only stopping if merge returns a non-zero exit processes them in turn only stopping if merge returns a non-zero exit
code. code.
Typically this is run with the a script calling git's imitation of Typically this is run with a script calling git's imitation of
the merge command from the RCS package. the merge command from the RCS package.
A sample script called "git-merge-one-file" is included in the A sample script called "git-merge-one-file" is included in the

2
Documentation/git-stash.txt
View File

@ -57,7 +57,7 @@ stash@{1}: On master: 9cc0589... Add git-stash
show [<stash>]:: show [<stash>]::
Show the changes recorded in the stash as a diff between the the Show the changes recorded in the stash as a diff between the
stashed state and its original parent. When no `<stash>` is given, stashed state and its original parent. When no `<stash>` is given,
shows the latest one. By default, the command shows the diffstat, but shows the latest one. By default, the command shows the diffstat, but
it will accept any format known to `git-diff` (e.g., `git-stash show it will accept any format known to `git-diff` (e.g., `git-stash show

2
Documentation/git-svn.txt
View File

@ -404,7 +404,7 @@ section because they affect the 'git-svn-id:' metadata line.
BASIC EXAMPLES BASIC EXAMPLES
-------------- --------------
Tracking and contributing to a the trunk of a Subversion-managed project: Tracking and contributing to the trunk of a Subversion-managed project:
------------------------------------------------------------------------ ------------------------------------------------------------------------
# Clone a repo (like git clone): # Clone a repo (like git clone):

2
Documentation/git-tag.txt
View File

@ -112,7 +112,7 @@ You really want to call the new version "X" too, 'even though'
others have already seen the old one. So just use "git tag -f" others have already seen the old one. So just use "git tag -f"
again, as if you hadn't already published the old one. again, as if you hadn't already published the old one.
However, Git does *not* (and it should not)change tags behind However, Git does *not* (and it should not) change tags behind
users back. So if somebody already got the old tag, doing a "git users back. So if somebody already got the old tag, doing a "git
pull" on your tree shouldn't just make them overwrite the old pull" on your tree shouldn't just make them overwrite the old
one. one.

4
Documentation/git.txt
View File

@ -326,7 +326,7 @@ For a more complete list of ways to spell object names, see
File/Directory Structure File/Directory Structure
------------------------ ------------------------
Please see link:repository-layout.html[repository layout] document. Please see the link:repository-layout.html[repository layout] document.
Read link:hooks.html[hooks] for more details about each hook. Read link:hooks.html[hooks] for more details about each hook.
@ -336,7 +336,7 @@ Higher level SCMs may provide and manage additional information in the
Terminology Terminology
----------- -----------
Please see link:glossary.html[glossary] document. Please see the link:glossary.html[glossary] document.
Environment Variables Environment Variables

6
Documentation/glossary.txt
View File

@ -52,8 +52,8 @@ GIT Glossary
[[def_cherry-picking]]cherry-picking:: [[def_cherry-picking]]cherry-picking::
In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of
changes out of a series of changes (typically commits) and record them changes out of a series of changes (typically commits) and record them
as a new series of changes on top of different codebase. In GIT, this is as a new series of changes on top of a different codebase. In GIT, this is
performed by "git cherry-pick" command to extract the change introduced performed by the "git cherry-pick" command to extract the change introduced
by an existing <<def_commit,commit>> and to record it based on the tip by an existing <<def_commit,commit>> and to record it based on the tip
of the current <<def_branch,branch>> as a new commit. of the current <<def_branch,branch>> as a new commit.
@ -347,7 +347,7 @@ This commit is referred to as a "merge commit", or sometimes just a
it as my origin branch head". And `git push it as my origin branch head". And `git push
$URL refs/heads/master:refs/heads/to-upstream` means "publish my $URL refs/heads/master:refs/heads/to-upstream` means "publish my
master branch head as to-upstream branch at $URL". See also master branch head as to-upstream branch at $URL". See also
gitlink:git-push[1] gitlink:git-push[1].
[[def_repository]]repository:: [[def_repository]]repository::
A collection of <<def_ref,refs>> together with an A collection of <<def_ref,refs>> together with an

27
Documentation/user-manual.txt
View File

@ -1495,7 +1495,7 @@ Ensuring good performance
------------------------- -------------------------
On large repositories, git depends on compression to keep the history On large repositories, git depends on compression to keep the history
information from taking up to much space on disk or in memory. information from taking up too much space on disk or in memory.
This compression is not performed automatically. Therefore you This compression is not performed automatically. Therefore you
should occasionally run gitlink:git-gc[1]: should occasionally run gitlink:git-gc[1]:
@ -1920,7 +1920,7 @@ As with git-fetch, git-push will complain if this does not result in
a <<fast-forwards,fast forward>>. Normally this is a sign of a <<fast-forwards,fast forward>>. Normally this is a sign of
something wrong. However, if you are sure you know what you're something wrong. However, if you are sure you know what you're
doing, you may force git-push to perform the update anyway by doing, you may force git-push to perform the update anyway by
proceeding the branch name by a plus sign: preceding the branch name by a plus sign:
------------------------------------------------- -------------------------------------------------
$ git push ssh://yourserver.com/~you/proj.git +master $ git push ssh://yourserver.com/~you/proj.git +master
@ -2040,7 +2040,7 @@ $ git branch --track test origin/master
$ git branch --track release origin/master $ git branch --track release origin/master
------------------------------------------------- -------------------------------------------------
These can be easily kept up to date using gitlink:git-pull[1] These can be easily kept up to date using gitlink:git-pull[1].
------------------------------------------------- -------------------------------------------------
$ git checkout test && git pull $ git checkout test && git pull
@ -2132,7 +2132,7 @@ changes are in a specific branch, use:
$ git log linux..branchname | git-shortlog $ git log linux..branchname | git-shortlog
------------------------------------------------- -------------------------------------------------
To see whether it has already been merged into the test or release branches To see whether it has already been merged into the test or release branches,
use: use:
------------------------------------------------- -------------------------------------------------
@ -2145,12 +2145,12 @@ or
$ git log release..branchname $ git log release..branchname
------------------------------------------------- -------------------------------------------------
(If this branch has not yet been merged you will see some log entries. (If this branch has not yet been merged, you will see some log entries.
If it has been merged, then there will be no output.) If it has been merged, then there will be no output.)
Once a patch completes the great cycle (moving from test to release, Once a patch completes the great cycle (moving from test to release,
then pulled by Linus, and finally coming back into your local then pulled by Linus, and finally coming back into your local
"origin/master" branch) the branch for this change is no longer needed. "origin/master" branch), the branch for this change is no longer needed.
You detect this when the output from: You detect this when the output from:
------------------------------------------------- -------------------------------------------------
@ -2479,7 +2479,7 @@ $ git checkout -b mywork-new origin
$ gitk origin..mywork & $ gitk origin..mywork &
------------------------------------------------- -------------------------------------------------
And browse through the list of patches in the mywork branch using gitk, and browse through the list of patches in the mywork branch using gitk,
applying them (possibly in a different order) to mywork-new using applying them (possibly in a different order) to mywork-new using
cherry-pick, and possibly modifying them as you go using commit --amend. cherry-pick, and possibly modifying them as you go using commit --amend.
The gitlink:git-gui[1] command may also help as it allows you to The gitlink:git-gui[1] command may also help as it allows you to
@ -2739,7 +2739,7 @@ others:
- Git can quickly determine whether two objects are identical or not, - Git can quickly determine whether two objects are identical or not,
just by comparing names. just by comparing names.
- Since object names are computed the same way in ever repository, the - Since object names are computed the same way in every repository, the
same content stored in two repositories will always be stored under same content stored in two repositories will always be stored under
the same name. the same name.
- Git can detect errors when it reads an object, by checking that the - Git can detect errors when it reads an object, by checking that the
@ -3425,9 +3425,10 @@ The Workflow
------------ ------------
High-level operations such as gitlink:git-commit[1], High-level operations such as gitlink:git-commit[1],
gitlink:git-checkout[1] and git-reset[1] work by moving data between the gitlink:git-checkout[1] and gitlink:git-reset[1] work by moving data
working tree, the index, and the object database. Git provides between the working tree, the index, and the object database. Git
low-level operations which perform each of these steps individually. provides low-level operations which perform each of these steps
individually.
Generally, all "git" operations work on the index file. Some operations Generally, all "git" operations work on the index file. Some operations
work *purely* on the index file (showing the current state of the work *purely* on the index file (showing the current state of the
@ -3704,7 +3705,7 @@ Merging multiple trees, continued
--------------------------------- ---------------------------------
Sadly, many merges aren't trivial. If there are files that have Sadly, many merges aren't trivial. If there are files that have
been added.moved or removed, or if both branches have modified the been added, moved or removed, or if both branches have modified the
same file, you will be left with an index tree that contains "merge same file, you will be left with an index tree that contains "merge
entries" in it. Such an index tree can 'NOT' be written out to a tree entries" in it. Such an index tree can 'NOT' be written out to a tree
object, and you will have to resolve any such merge clashes using object, and you will have to resolve any such merge clashes using
@ -4061,7 +4062,7 @@ $ git branch new # create branch "new" starting at current HEAD
$ git branch -d new # delete branch "new" $ git branch -d new # delete branch "new"
----------------------------------------------- -----------------------------------------------
Instead of basing new branch on current HEAD (the default), use: Instead of basing a new branch on current HEAD (the default), use:
----------------------------------------------- -----------------------------------------------
$ git branch new test # branch named "test" $ git branch new test # branch named "test"