summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-09-29 20:30:00 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-09-30 18:51:16 (GMT)
commit79fd4cc749826dd78c6ab3cd225bdb5c92db2de8 (patch)
treeee7a42bd3f6ff3e34030389f9f09ed31bf307ba3 /Documentation/git-read-tree.txt
parent1d4c4986708688c14e72a5b442a3432048aeea79 (diff)
downloadgit-79fd4cc749826dd78c6ab3cd225bdb5c92db2de8.zip
git-79fd4cc749826dd78c6ab3cd225bdb5c92db2de8.tar.gz
git-79fd4cc749826dd78c6ab3cd225bdb5c92db2de8.tar.bz2
Correct typos in RelNotes-1.6.1
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 309deac..7160fa1 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -212,7 +212,7 @@ output after two-tree merge.
Case #3 is slightly tricky and needs explanation. The result from this
rule logically should be to remove the path if the user staged the removal
-of the path and then swiching to a new branch. That however will prevent
+of the path and then switching to a new branch. That however will prevent
the initial checkout from happening, so the rule is modified to use M (new
tree) only when the contents of the index is empty. Otherwise the removal
of the path is kept as long as $H and $M are the same.