Teach receive-pack to run pre-receive/post-receive hooks

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index a5e7b536f2bbb3355f9fa198a369c4c8c595e76d..ffd673ec335c3d85d6815dcfdc3e1bfd019f8551 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2861,7 +2861,7 @@ 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.
 
 How git stores objects efficiently: pack files
 ----------------------------------------------