rebase: Allow merge strategies to be used when rebasing

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 2c6065fcb19b4871828d2addb42362f8802f6064..60debca48720ad54766287e8770254f57fad9d7b 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -1,6 +1,5 @@
 git-receive-pack(1)
 ===================
-v0.1, July 2005
 
 NAME
 ----
@@ -72,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>::
@@ -80,7 +83,7 @@ OPTIONS
 
 SEE ALSO
 --------
-link:git-send-pack.html[git-send-pack]
+gitlink:git-send-pack[1]
 
 
 Author
@@ -93,4 +96,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite