rebase: Allow merge strategies to be used when rebasing

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 8afde14373723a9894e4da5b7f2281b18e75e93f..60debca48720ad54766287e8770254f57fad9d7b 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -71,6 +71,10 @@ packed and is served via a dumb transport.
        #!/bin/sh
        exec git-update-server-info
 
+There are other real-world examples of using update and
+post-update hooks found in the Documentation/howto directory.
+
+
 OPTIONS
 -------
 <directory>::