Fix some typos, punctuation, missing words, minor markup.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Ralf Wildenhues committed
Oct 9, 2007 at 23:00 UTC
06ada1529ce46e84aaef4e5608c1101c1c7ec73f
10 files changed
+27
-26
Documentation/config.txt
+2
-2
@@ -188,7 +188,7 @@ core.worktree::
188
Set the path to the working tree. The value will not be
189
used in combination with repositories found automatically in
190
a .git directory (i.e. $GIT_DIR is not set).
191
- This can be overriden by the GIT_WORK_TREE environment
191
+ This can be overridden by the GIT_WORK_TREE environment
192
variable and the '--work-tree' command line option.
193
194
core.logAllRefUpdates::
@@ -607,7 +607,7 @@ merge.verbosity::
607
message if conflicts were detected. Level 1 outputs only
608
conflicts, 2 outputs conflicts and file changes. Level 5 and
609
above outputs debugging information. The default is level 2.
610
- Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
610
+ Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
611
612
merge.<driver>.name::
613
Defines a human readable name for a custom low-level
Documentation/git-diff.txt
+1
-1
@@ -125,7 +125,7 @@ $ git diff topic...master <3>
125
+
126
<1> Changes between the tips of the topic and the master branches.
127
<2> Same as above.
128
-<3> Changes that occured on the master branch since when the topic
128
+<3> Changes that occurred on the master branch since when the topic
129
branch was started off it.
130
131
Limiting the diff output::
Documentation/git-index-pack.txt
+1
-1
@@ -43,7 +43,7 @@ OPTIONS
43
a default name determined from the pack content. If
44
<pack-file> is not specified consider using --keep to
45
prevent a race condition between this process and
46
- gitlink::git-repack[1] .
46
+ gitlink::git-repack[1].
47
48
--fix-thin::
49
It is possible for gitlink:git-pack-objects[1] to build
Documentation/git-merge-index.txt
+1
-1
@@ -40,7 +40,7 @@ If "git-merge-index" is called with multiple <file>s (or -a) then it
40
processes them in turn only stopping if merge returns a non-zero exit
41
code.
42
43
-Typically this is run with the a script calling git's imitation of
43
+Typically this is run with a script calling git's imitation of
44
the merge command from the RCS package.
45
46
A sample script called "git-merge-one-file" is included in the
Documentation/git-stash.txt
+1
-1
@@ -57,7 +57,7 @@ stash@{1}: On master: 9cc0589... Add git-stash
57
58
show [<stash>]::
59
60
- Show the changes recorded in the stash as a diff between the the
60
+ Show the changes recorded in the stash as a diff between the
61
stashed state and its original parent. When no `<stash>` is given,
62
shows the latest one. By default, the command shows the diffstat, but
63
it will accept any format known to `git-diff` (e.g., `git-stash show
Documentation/git-svn.txt
+1
-1
@@ -404,7 +404,7 @@ section because they affect the 'git-svn-id:' metadata line.
404
BASIC EXAMPLES
405
--------------
406
407
-Tracking and contributing to a the trunk of a Subversion-managed project:
407
+Tracking and contributing to the trunk of a Subversion-managed project:
408
409
------------------------------------------------------------------------
410
# Clone a repo (like git clone):
Documentation/git-tag.txt
+1
-1
@@ -112,7 +112,7 @@ You really want to call the new version "X" too, 'even though'
112
others have already seen the old one. So just use "git tag -f"
113
again, as if you hadn't already published the old one.
114
115
-However, Git does *not* (and it should not)change tags behind
115
+However, Git does *not* (and it should not) change tags behind
116
users back. So if somebody already got the old tag, doing a "git
117
pull" on your tree shouldn't just make them overwrite the old
118
one.
Documentation/git.txt
+2
-2
@@ -326,7 +326,7 @@ For a more complete list of ways to spell object names, see
326
File/Directory Structure
327
------------------------
328
329
-Please see link:repository-layout.html[repository layout] document.
329
+Please see the link:repository-layout.html[repository layout] document.
330
331
Read link:hooks.html[hooks] for more details about each hook.
332
@@ -336,7 +336,7 @@ Higher level SCMs may provide and manage additional information in the
336
337
Terminology
338
-----------
339
-Please see link:glossary.html[glossary] document.
339
+Please see the link:glossary.html[glossary] document.
340
341
342
Environment Variables
Documentation/glossary.txt
+3
-3
@@ -52,8 +52,8 @@ GIT Glossary
52
[[def_cherry-picking]]cherry-picking::
53
In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of
54
changes out of a series of changes (typically commits) and record them
55
- as a new series of changes on top of different codebase. In GIT, this is
56
- performed by "git cherry-pick" command to extract the change introduced
55
+ as a new series of changes on top of a different codebase. In GIT, this is
56
+ performed by the "git cherry-pick" command to extract the change introduced
57
by an existing <<def_commit,commit>> and to record it based on the tip
58
of the current <<def_branch,branch>> as a new commit.
59
@@ -347,7 +347,7 @@ This commit is referred to as a "merge commit", or sometimes just a
347
it as my origin branch head". And `git push
348
$URL refs/heads/master:refs/heads/to-upstream` means "publish my
349
master branch head as to-upstream branch at $URL". See also
350
- gitlink:git-push[1]
350
+ gitlink:git-push[1].
351
352
[[def_repository]]repository::
353
A collection of <<def_ref,refs>> together with an
Documentation/user-manual.txt
+14
-13
@@ -1495,7 +1495,7 @@ Ensuring good performance
1495
-------------------------
1496
1497
On large repositories, git depends on compression to keep the history
1498
-information from taking up to much space on disk or in memory.
1498
+information from taking up too much space on disk or in memory.
1499
1500
This compression is not performed automatically. Therefore you
1501
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
1920
a <<fast-forwards,fast forward>>. Normally this is a sign of
1921
something wrong. However, if you are sure you know what you're
1922
doing, you may force git-push to perform the update anyway by
1923
-proceeding the branch name by a plus sign:
1923
+preceding the branch name by a plus sign:
1924
1925
-------------------------------------------------
1926
$ git push ssh://yourserver.com/~you/proj.git +master
@@ -2040,7 +2040,7 @@ $ git branch --track test origin/master
2040
$ git branch --track release origin/master
2041
-------------------------------------------------
2042
2043
-These can be easily kept up to date using gitlink:git-pull[1]
2043
+These can be easily kept up to date using gitlink:git-pull[1].
2044
2045
-------------------------------------------------
2046
$ git checkout test && git pull
@@ -2132,7 +2132,7 @@ changes are in a specific branch, use:
2132
$ git log linux..branchname | git-shortlog
2133
-------------------------------------------------
2134
2135
-To see whether it has already been merged into the test or release branches
2135
+To see whether it has already been merged into the test or release branches,
2136
use:
2137
2138
-------------------------------------------------
@@ -2145,12 +2145,12 @@ or
2145
$ git log release..branchname
2146
-------------------------------------------------
2147
2148
-(If this branch has not yet been merged you will see some log entries.
2148
+(If this branch has not yet been merged, you will see some log entries.
2149
If it has been merged, then there will be no output.)
2150
2151
Once a patch completes the great cycle (moving from test to release,
2152
then pulled by Linus, and finally coming back into your local
2153
-"origin/master" branch) the branch for this change is no longer needed.
2153
+"origin/master" branch), the branch for this change is no longer needed.
2154
You detect this when the output from:
2155
2156
-------------------------------------------------
@@ -2479,7 +2479,7 @@ $ git checkout -b mywork-new origin
2479
$ gitk origin..mywork &
2480
-------------------------------------------------
2481
2482
-And browse through the list of patches in the mywork branch using gitk,
2482
+and browse through the list of patches in the mywork branch using gitk,
2483
applying them (possibly in a different order) to mywork-new using
2484
cherry-pick, and possibly modifying them as you go using commit --amend.
2485
The gitlink:git-gui[1] command may also help as it allows you to
@@ -2739,7 +2739,7 @@ others:
2739
2740
- Git can quickly determine whether two objects are identical or not,
2741
just by comparing names.
2742
-- Since object names are computed the same way in ever repository, the
2742
+- Since object names are computed the same way in every repository, the
2743
same content stored in two repositories will always be stored under
2744
the same name.
2745
- Git can detect errors when it reads an object, by checking that the
@@ -3425,9 +3425,10 @@ The Workflow
3425
------------
3426
3427
High-level operations such as gitlink:git-commit[1],
3428
-gitlink:git-checkout[1] and git-reset[1] work by moving data between the
3429
-working tree, the index, and the object database. Git provides
3430
-low-level operations which perform each of these steps individually.
3428
+gitlink:git-checkout[1] and gitlink:git-reset[1] work by moving data
3429
+between the working tree, the index, and the object database. Git
3430
+provides low-level operations which perform each of these steps
3431
+individually.
3432
3433
Generally, all "git" operations work on the index file. Some operations
3434
work *purely* on the index file (showing the current state of the
@@ -3704,7 +3705,7 @@ Merging multiple trees, continued
3705
---------------------------------
3706
3707
Sadly, many merges aren't trivial. If there are files that have
3707
-been added.moved or removed, or if both branches have modified the
3708
+been added, moved or removed, or if both branches have modified the
3709
same file, you will be left with an index tree that contains "merge
3710
entries" in it. Such an index tree can 'NOT' be written out to a tree
3711
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
4062
$ git branch -d new # delete branch "new"
4063
-----------------------------------------------
4064
4064
-Instead of basing new branch on current HEAD (the default), use:
4065
+Instead of basing a new branch on current HEAD (the default), use:
4066
4067
-----------------------------------------------
4068
$ git branch new test # branch named "test"