summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-04 07:01:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-04 07:01:52 (GMT)
commitf63237a18e951b93ac46a0e594f286255e1eaaaf (patch)
treea131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/git-read-tree.txt
parentb9d301bca767c9c26b8514fb326dd237cb269fbb (diff)
parente96fd30553bb57a76ad38f703a3fea5b53c45ff9 (diff)
downloadgit-f63237a18e951b93ac46a0e594f286255e1eaaaf.zip
git-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.gz
git-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.bz2
Merge branch 'vb/sendemail' into next
* vb/sendemail: Cleanup git-send-email.perl:extract_valid_email read-tree --reset: update working tree file for conflicted paths. Documentation: Spelling fixes Builtin git-rev-parse. fetch: do not report "same" unless -verbose.
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 1f21d95..1c01d00 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -214,7 +214,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
@@ -235,7 +235,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,