X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-read-tree.txt;h=7db5fb579597373128c9cbb44ef02adf5e9da8a0;hb=7b9ae53ea3680f5b0d17a2dd40b39a17f1fcc5cf;hp=0639bd04b2915c1e381021ef2018b203adc13b4b;hpb=f318dd229f9df88470de8541916d48c9380e2e35;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 0639bd04..7db5fb57 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -1,6 +1,5 @@ git-read-tree(1) ================ -v0.1, May 2005 NAME ---- @@ -84,10 +83,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".