X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-read-tree.txt;h=5653baccaffe888bc5a238e0fef8212045ab187d;hb=8b73edf498adf2895af7ff9c750283cf9325a632;hp=0639bd04b2915c1e381021ef2018b203adc13b4b;hpb=348c4c66dacb1810a9bcd592e72f98a465233488;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 0639bd04..5653bacc 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -84,10 +84,10 @@ fast forward situation). When two trees are specified, the user is telling git-read-tree the following: - (1) The current index and work tree is derived from $H, but + 1. The current index and work tree is derived from $H, but the user may have local changes in them since $H; - (2) The user wants to fast-forward to $M. + 2. The user wants to fast-forward to $M. In this case, the "git-read-tree -m $H $M" command makes sure that no local change is lost as the result of this "merge".