summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorSteve Hoelzer <shoelzer@gmail.com>2007-08-01 15:43:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-02 01:15:43 (GMT)
commit434e6ef89d73dcc812b3a44dfaff0ca8204a206e (patch)
tree7e00bbd27b7480d751ece390adb793ba732d678f /Documentation/git-merge.txt
parent6d4bbebd35e3a6e8091d7188f1c4d49af7f054e3 (diff)
downloadgit-434e6ef89d73dcc812b3a44dfaff0ca8204a206e.zip
git-434e6ef89d73dcc812b3a44dfaff0ca8204a206e.tar.gz
git-434e6ef89d73dcc812b3a44dfaff0ca8204a206e.tar.bz2
Try to be consistent with capitalization in the documentation
Signed-off-by: Steve Hoelzer <shoelzer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 2c9db98..144bc16 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