Merge fixes up to GIT 1.0.4

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index f45ac5ee4910198fa351e56bb40333612787fcd2..2254bac16e65e6a0a097b6fef80aed6e1d6887d4 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -16,6 +16,10 @@ DESCRIPTION
 Updates remote refs using local refs, while sending objects
 necessary to complete the given refs.
 
+You can make "interesting" things to happen on the repository
+every time you push into it, by setting up 'hooks' there.  See
+documentation for gitlink:git-receive-pack[1].
+
 
 OPTIONS
 -------
@@ -31,6 +35,7 @@ include::pull-fetch-param.txt[]
        This flag disables the check.  What this means is that the
        local repository can lose commits; use it with care.
 
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>