Merge branch 'mh/maint-http-proxy-fix' into maint

[git.git] / Documentation / git-send-pack.txt

diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 2fa01d4a3ca92ed3a3896e4df416cf8f3933c885..777515b12e5e3b276285d3b034f91aab5c1e34cc 100644 (file)
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-Usually you would want to use gitlink:git-push[1] which is a
+Usually you would want to use linkgit:git-push[1] which is a

 higher level wrapper of this command instead.
 
 Invokes 'git-receive-pack' on a possibly remote repository, and
 higher level wrapper of this command instead.
 
 Invokes 'git-receive-pack' on a possibly remote repository, and


@@ -85,7 +85,9 @@ Each pattern pair consists of the source side (before the colon)
 and the destination side (after the colon).  The ref to be
 pushed is determined by finding a match that matches the source
 side, and where it is pushed is determined by using the
 and the destination side (after the colon).  The ref to be
 pushed is determined by finding a match that matches the source
 side, and where it is pushed is determined by using the

-destination side.
+destination side. The rules used to match a ref are the same
+rules used by linkgit:git-rev-parse[1] to resolve a symbolic ref
+name.

 
  - It is an error if <src> does not match exactly one of the
    local refs.
 
  - It is an error if <src> does not match exactly one of the
    local refs.


@@ -123,4 +125,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite