diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
| commit | a77a51375dec1ea55c96563953187d6ce3d924cd (patch) | |
| tree | bd5e64c4f3d367dcf2be694575f0e5edcb03b1a7 /git-merge.txt | |
| parent | 359b40ddcc057e3c5e382544a151c97db2db5002 (diff) | |
| download | git-htmldocs-a77a51375dec1ea55c96563953187d6ce3d924cd.tar.gz | |
Autogenerated HTML docs for v1.5.2.1-144-gabc40
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 912ef29ef..d285cba03 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -95,7 +95,7 @@ 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 +3. the tree gets committed, and 4. the `HEAD` pointer gets advanced. Because of 2., we require that the original state of the index |