Fix minor typos/grammar in user-manual.txt
Signed-off-by: Junio C Hamano <junkio@cox.net>
Michael Coleman committed
Feb 27, 2007 at 22:13 UTC
79c96c573357385cdc6d15b37bf65e5c137092ef
1 file changed
+14
-17
Documentation/user-manual.txt
+14
-17
@@ -2,7 +2,7 @@ Git User's Manual
2
_________________
3
4
This manual is designed to be readable by someone with basic unix
5
-commandline skills, but no previous knowledge of git.
5
+command-line skills, but no previous knowledge of git.
6
7
Chapter 1 gives a brief overview of git commands, without any
8
explanation; you may prefer to skip to chapter 2 on a first reading.
@@ -1196,7 +1196,7 @@ will be HEAD, the tip of the current branch; the other will be the
1196
tip of the other branch, which is stored temporarily in MERGE_HEAD.
1197
1198
The diff above shows the differences between the working-tree version
1199
-of file.txt and two previous version: one version from HEAD, and one
1199
+of file.txt and two previous versions: one version from HEAD, and one
1200
from MERGE_HEAD. So instead of preceding each line by a single "+"
1201
or "-", it now uses two columns: the first column is used for
1202
differences between the first parent and the working directory copy,
@@ -1479,7 +1479,7 @@ Examining dangling objects
1479
1480
In some situations the reflog may not be able to save you. For
1481
example, suppose you delete a branch, then realize you need the history
1482
-it pointed you. The reflog is also deleted; however, if you have not
1482
+it contained. The reflog is also deleted; however, if you have not
1483
yet pruned the repository, then you may still be able to find
1484
the lost commits; run git-fsck and watch for output that mentions
1485
"dangling commits":
@@ -1505,7 +1505,7 @@ history that is described by all your existing branches and tags. Thus
1505
you get exactly the history reachable from that commit that is lost.
1506
(And notice that it might not be just one commit: we only report the
1507
"tip of the line" as being dangling, but there might be a whole deep
1508
-and complex commit history that was gotten dropped.)
1508
+and complex commit history that was dropped.)
1509
1510
If you decide you want the history back, you can always create a new
1511
reference pointing to it, for example, a new branch:
@@ -1561,7 +1561,7 @@ repository that you pulled from.
1561
1562
(But note that no such commit will be created in the case of a
1563
<<fast-forwards,fast forward>>; instead, your branch will just be
1564
-updated to point to the latest commit from the upstream branch).
1564
+updated to point to the latest commit from the upstream branch.)
1565
1566
The git-pull command can also be given "." as the "remote" repository,
1567
in which case it just merges in a branch from the current repository; so
@@ -1638,8 +1638,8 @@ updates with git pull>>".
1638
1639
If you and maintainer both have accounts on the same machine, then
1640
then you can just pull changes from each other's repositories
1641
-directly; note that all of the command (gitlink:git-clone[1],
1642
-git-fetch[1], git-pull[1], etc.) which accept a URL as an argument
1641
+directly; note that all of the commands (gitlink:git-clone[1],
1642
+git-fetch[1], git-pull[1], etc.) that accept a URL as an argument
1643
will also accept a local file patch; so, for example, you can
1644
use
1645
@@ -1832,7 +1832,7 @@ that makes it easy for them to read your changes, verify that they are
1832
correct, and understand why you made each change.
1833
1834
If you present all of your changes as a single patch (or commit), they
1835
-may find it is too much to digest all at once.
1835
+may find that it is too much to digest all at once.
1836
1837
If you present them with the entire history of your work, complete with
1838
mistakes, corrections, and dead ends, they may be overwhelmed.
@@ -1858,11 +1858,8 @@ you are rewriting history.
1858
Keeping a patch series up to date using git-rebase
1859
--------------------------------------------------
1860
1861
-Suppose you have a series of commits in a branch "mywork", which
1862
-originally branched off from "origin".
1863
-
1864
-Suppose you create a branch "mywork" on a remote-tracking branch
1865
-"origin", and created some commits on top of it:
1861
+Suppose that you create a branch "mywork" on a remote-tracking branch
1862
+"origin", and create some commits on top of it:
1863
1864
-------------------------------------------------
1865
$ git checkout -b mywork origin
@@ -1966,7 +1963,7 @@ Other tools
1963
-----------
1964
1965
There are numerous other tools, such as stgit, which exist for the
1969
-purpose of maintaining a patch series. These are out of the scope of
1966
+purpose of maintaining a patch series. These are outside of the scope of
1967
this manual.
1968
1969
Problems with rewriting history
@@ -2088,7 +2085,7 @@ descendant of the old head, you may force the update with:
2085
$ git fetch git://example.com/proj.git +master:refs/remotes/example/master
2086
-------------------------------------------------
2087
2091
-Note the addition of the "+" sign. Be aware that commits which the
2088
+Note the addition of the "+" sign. Be aware that commits that the
2089
old version of example/master pointed at may be lost, as we saw in
2090
the previous section.
2091
@@ -2096,7 +2093,7 @@ Configuring remote branches
2093
---------------------------
2094
2095
We saw above that "origin" is just a shortcut to refer to the
2099
-repository which you originally cloned from. This information is
2096
+repository that you originally cloned from. This information is
2097
stored in git configuration variables, which you can see using
2098
gitlink:git-config[1]:
2099
@@ -2407,7 +2404,7 @@ conflicts between different tree objects, allowing each pathname to be
2404
associated with sufficient information about the trees involved that
2405
you can create a three-way merge between them.'
2406
2410
-Those are the three ONLY things that the directory cache does. It's a
2407
+Those are the ONLY three things that the directory cache does. It's a
2408
cache, and the normal operation is to re-generate it completely from a
2409
known tree object, or update/compare it with a live tree that is being
2410
developed. If you blow the directory cache away entirely, you generally