X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-read-tree.txt;h=7160fa1536e3af2edbdfb6d1049f2145bf2b4f50;hb=9b3b7fd8072783e2ec20b3cf622713d39b1c8af4;hp=309deac23b5bf8eea28441d34e78b7cdb3a02d28;hpb=4c048e358c0ca39b023d207113624fae464df851;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 309deac23..7160fa153 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.