Tutorial: do not use 'git resolve'.

diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index 57f47208716fd1f51f40d8d8104b4e764e0a013d..7ee3571bc09642f07ec50d5b3cfc9d802119889e 100644 (file)
--- a/Documentation/hooks.txt
+++ b/Documentation/hooks.txt
@@ -1,6 +1,5 @@
-Hooks used by GIT
+Hooks used by git
 =================
-v0.99.6, Sep 2005
 
 Hooks are little scripts you can place in `$GIT_DIR/hooks`
 directory to trigger action at certain points.  When