From 79fd4cc749826dd78c6ab3cd225bdb5c92db2de8 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 29 Sep 2008 22:30:00 +0200 Subject: Correct typos in RelNotes-1.6.1 Signed-off-by: Shawn O. Pearce --- Documentation/git-read-tree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-read-tree.txt') diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 309deac23b..7160fa1536 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. -- cgit v1.2.3