user-manual: typo and grammar fixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Hanchrow committed
Jul 8, 2008 at 13:00 UTC
843c81dcf48753629783270677052b4b8211fb06
1 file changed
+9
-9
Documentation/user-manual.txt
+9
-9
@@ -518,7 +518,7 @@ $ git bisect visualize
518
-------------------------------------------------
519
520
which will run gitk and label the commit it chose with a marker that
521
-says "bisect". Chose a safe-looking commit nearby, note its commit
521
+says "bisect". Choose a safe-looking commit nearby, note its commit
522
id, and check it out with:
523
524
-------------------------------------------------
@@ -1988,8 +1988,8 @@ intend to manage the branch.
1988
1989
It's also possible for a push to fail in this way when other people have
1990
the right to push to the same repository. In that case, the correct
1991
-solution is to retry the push after first updating your work by either a
1992
-pull or a fetch followed by a rebase; see the
1991
+solution is to retry the push after first updating your work: either by a
1992
+pull, or by a fetch followed by a rebase; see the
1993
<<setting-up-a-shared-repository,next section>> and
1994
linkgit:gitcvs-migration[7] for more.
1995
@@ -2861,7 +2861,7 @@ There are four different types of objects: "blob", "tree", "commit", and
2861
"tag".
2862
2863
- A <<def_blob_object,"blob" object>> is used to store file data.
2864
-- A <<def_tree_object,"tree" object>> is an object that ties one or more
2864
+- A <<def_tree_object,"tree" object>> ties one or more
2865
"blob" objects into a directory structure. In addition, a tree object
2866
can refer to other tree objects, thus creating a directory hierarchy.
2867
- A <<def_commit_object,"commit" object>> ties such directory hierarchies
@@ -3036,7 +3036,7 @@ Tag Object
3036
3037
A tag object contains an object, object type, tag name, the name of the
3038
person ("tagger") who created the tag, and a message, which may contain
3039
-a signature, as can be seen using the linkgit:git-cat-file[1]:
3039
+a signature, as can be seen using linkgit:git-cat-file[1]:
3040
3041
------------------------------------------------
3042
$ git cat-file tag v1.5.0
@@ -3986,13 +3986,13 @@ $ mv -f hello.c~2 hello.c
3986
$ git update-index hello.c
3987
-------------------------------------------------
3988
3989
-When a path is in unmerged state, running `git-update-index` for
3989
+When a path is in the "unmerged" state, running `git-update-index` for
3990
that path tells git to mark the path resolved.
3991
3992
The above is the description of a git merge at the lowest level,
3993
to help you understand what conceptually happens under the hood.
3994
-In practice, nobody, not even git itself, uses three `git-cat-file`
3995
-for this. There is `git-merge-index` program that extracts the
3994
+In practice, nobody, not even git itself, runs `git-cat-file` three times
3995
+for this. There is a `git-merge-index` program that extracts the
3996
stages to temporary files and calls a "merge" script on it:
3997
3998
-------------------------------------------------
@@ -4061,7 +4061,7 @@ Note that terminology has changed since that revision. For example, the
4061
README in that revision uses the word "changeset" to describe what we
4062
now call a <<def_commit_object,commit>>.
4063
4064
-Also, we do not call it "cache" any more, but "index", however, the
4064
+Also, we do not call it "cache" any more, but rather "index"; however, the
4065
file is still called `cache.h`. Remark: Not much reason to change it now,
4066
especially since there is no good single name for it anyway, because it is
4067
basically _the_ header file which is included by _all_ of Git's C sources.