git-cvsimport: fix merging with remote parent branch

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 4ef18404722e045bbc0b010545b3a34cac2d6586..4111434bb6f1ba148737c91b7c5a9ba40cb4811d 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -78,7 +78,7 @@ The hook should exit with non-zero status if it wants to disallow
 updating the named ref.  Otherwise it should exit with zero.
 
 Successful execution (a zero exit status) of this hook does not
-ensure the ref will actully be updated, it is only a prerequisite.
+ensure the ref will actually be updated, it is only a prerequisite.
 As such it is not a good idea to send notices (e.g. email) from
 this hook.  Consider using the post-receive hook instead.
 
@@ -149,7 +149,7 @@ if the repository is packed and is served via a dumb transport.
 
 SEE ALSO
 --------
-gitlink:git-send-pack[1]
+linkgit:git-send-pack[1]
 
 
 Author
@@ -162,4 +162,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite