@matheusbsbs / matheus-bagliano / commits / 1130845be8
Fork 0

user-manual: fix typolets.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 24, 2007 at 01:58 UTC 1130845be8b72aa47b7264186c16d788d52fda63
1 file changed +4 -4
Documentation/user-manual.txt
+4 -4
@@ -449,7 +449,7 @@ Exploring git history
449
450 Git is best thought of as a tool for storing the history of a
451 collection of files. It does this by storing compressed snapshots of
452 -the contents of a file heirarchy, together with "commits" which show
452 +the contents of a file hierarchy, together with "commits" which show
453 the relationships between these snapshots.
454
455 Git provides extremely flexible and fast tools for exploring the
@@ -1070,7 +1070,7 @@ about to commit:
1070
1071 -------------------------------------------------
1072 $ git diff --cached # difference between HEAD and the index; what
1073 - # would be commited if you ran "commit" now.
1073 + # would be committed if you ran "commit" now.
1074 $ git diff # difference between the index file and your
1075 # working directory; changes that would not
1076 # be included if you ran "commit" now.
@@ -1257,7 +1257,7 @@ index 802992c,2b60207..0000000
1257 ++>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
1258 -------------------------------------------------
1259
1260 -Recall that the commit which will be commited after we resolve this
1260 +Recall that the commit which will be committed after we resolve this
1261 conflict will have two parents instead of the usual one: one parent
1262 will be HEAD, the tip of the current branch; the other will be the
1263 tip of the other branch, which is stored temporarily in MERGE_HEAD.
@@ -1351,7 +1351,7 @@ away, you can always return to the pre-merge state with
1351 $ git reset --hard HEAD
1352 -------------------------------------------------
1353
1354 -Or, if you've already commited the merge that you want to throw away,
1354 +Or, if you've already committed the merge that you want to throw away,
1355
1356 -------------------------------------------------
1357 $ git reset --hard ORIG_HEAD