X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=144bc16ff26bbf1d311482e6be15fc034994ce49;hb=89df580d0a2e97b0c7c072d87e5e815534deed56;hp=2c9db98a3cfa616c09dcfd340dcd022aeb7c91e0;hpb=dbddb714b0e69ef15fba64e74f34244ab95f0610;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 2c9db98a3..144bc16ff 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -107,11 +107,11 @@ pull after you are done and ready. When things cleanly merge, these things happen: -1. the results are updated both in the index file and in your - working tree, -2. index file is written out as a tree, -3. the tree gets committed, and -4. the `HEAD` pointer gets advanced. +1. The results are updated both in the index file and in your + working tree; +2. Index file is written out as a tree; +3. The tree gets committed; and +4. The `HEAD` pointer gets advanced. Because of 2., we require that the original state of the index file to match exactly the current `HEAD` commit; otherwise we