@ -40,7 +40,7 @@ If "git-merge-index" is called with multiple <file>s (or -a) then it
@@ -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
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.
A sample script called "git-merge-one-file" is included in the
@ -404,7 +404,7 @@ section because they affect the 'git-svn-id:' metadata line.
@@ -404,7 +404,7 @@ section because they affect the 'git-svn-id:' metadata line.
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:
@ -112,7 +112,7 @@ You really want to call the new version "X" too, 'even though'
@@ -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"
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
pull" on your tree shouldn't just make them overwrite the old
@ -326,7 +326,7 @@ For a more complete list of ways to spell object names, see
@@ -326,7 +326,7 @@ For a more complete list of ways to spell object names, see
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.
@ -336,7 +336,7 @@ Higher level SCMs may provide and manage additional information in the
@@ -336,7 +336,7 @@ Higher level SCMs may provide and manage additional information in the
Terminology
-----------
Please see link:glossary.html[glossary] document.
Please see the link:glossary.html[glossary] document.
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
as a new series of changes on top of different codebase. In GIT, this is
performed by "git cherry-pick" command to extract the change introduced
as a new series of changes on top of a different codebase. In GIT, this is
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
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
@@ -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
$URL refs/heads/master:refs/heads/to-upstream` means "publish my
master branch head as to-upstream branch at $URL". See also
@ -1495,7 +1495,7 @@ Ensuring good performance
@@ -1495,7 +1495,7 @@ Ensuring good performance
-------------------------
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
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,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
something wrong. However, if you are sure you know what you're
doing, you may force git-push to perform the update anyway by
- Git can quickly determine whether two objects are identical or not,
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
the same name.
- Git can detect errors when it reads an object, by checking that the
@ -3425,9 +3425,10 @@ The Workflow
@@ -3425,9 +3425,10 @@ The Workflow
------------
High-level operations such as gitlink:git-commit[1],
gitlink:git-checkout[1] and git-reset[1] work by moving data between the
working tree, the index, and the object database. Git provides
low-level operations which perform each of these steps individually.
gitlink:git-checkout[1] and gitlink:git-reset[1] work by moving data
between the working tree, the index, and the object database. Git
provides low-level operations which perform each of these steps
individually.
Generally, all "git" operations work on the index file. Some operations
work *purely* on the index file (showing the current state of the
@ -3704,7 +3705,7 @@ Merging multiple trees, continued
@@ -3704,7 +3705,7 @@ Merging multiple trees, continued
---------------------------------
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
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
@ -4061,7 +4062,7 @@ $ git branch new # create branch "new" starting at current HEAD
@@ -4061,7 +4062,7 @@ $ git branch new # create branch "new" starting at current HEAD
$ 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: