Merge branch 'js/reverse'

[git.git] / Documentation / core-intro.txt

diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt
index 0458dc3d0263d40854e07d1a8ac53d1ec88379e7..24b060b91e25855c47ef594dfcbeca43cdb5e677 100644 (file)
--- a/Documentation/core-intro.txt
+++ b/Documentation/core-intro.txt
@@ -82,7 +82,7 @@ size> + <byte\0> + <binary object data>.
 
 The structured objects can further have their structure and
 connectivity to other objects verified. This is generally done with
-the `git-fsck-objects` program, which generates a full dependency graph
+the `git-fsck` program, which generates a full dependency graph
 of all objects, and verifies their internal consistency (in addition
 to just verifying their superficial consistency through the hash).
 
@@ -587,4 +587,5 @@ stages to temporary files and calls a "merge" script on it:
 
        git-merge-index git-merge-one-file hello.c
 
-and that is what higher level `git resolve` is implemented with.
+and that is what higher level `git merge -s resolve` is implemented
+with.