summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorHorst H. von Brand <vonbrand@inf.utfsm.cl>2006-06-03 20:27:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-04 06:54:55 (GMT)
commitabda1ef590d94a5e15e7ce3b685b5c092a790cfa (patch)
tree73162a92b2abd5d87b86566899e321dd8ccef59c /Documentation/git-read-tree.txt
parent895f10c3b596ef955c7f252717e5b4668530c569 (diff)
downloadgit-abda1ef590d94a5e15e7ce3b685b5c092a790cfa.zip
git-abda1ef590d94a5e15e7ce3b685b5c092a790cfa.tar.gz
git-abda1ef590d94a5e15e7ce3b685b5c092a790cfa.tar.bz2
Documentation: Spelling fixes
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 844cfda..02c7e99 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -205,7 +205,7 @@ The `git-write-tree` command refuses to write a nonsensical tree, and it
will complain about unmerged entries if it sees a single entry that is not
stage 0.
-Ok, this all sounds like a collection of totally nonsensical rules,
+OK, this all sounds like a collection of totally nonsensical rules,
but it's actually exactly what you want in order to do a fast
merge. The different stages represent the "result tree" (stage 0, aka
"merged"), the original tree (stage 1, aka "orig"), and the two trees
@@ -226,7 +226,7 @@ populated. Here is an outline of how the algorithm works:
- the index file saves and restores with all this information, so you
can merge things incrementally, but as long as it has entries in
- stages 1/2/3 (ie "unmerged entries") you can't write the result. So
+ stages 1/2/3 (i.e., "unmerged entries") you can't write the result. So
now the merge algorithm ends up being really simple:
* you walk the index in order, and ignore all entries of stage 0,