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 205bfd2d259abd33873305d28281166a42285f6e..777515b12e5e3b276285d3b034f91aab5c1e34cc 100644 (file)
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -8,11 +8,11 @@ git-send-pack - Push objects over git protocol to another repository
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-send-pack' [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
+'git-send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]

 
 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


@@ -32,7 +32,10 @@ OPTIONS
 
 \--all::
        Instead of explicitly specifying which refs to update,
 
 \--all::
        Instead of explicitly specifying which refs to update,

-       update all refs that locally exist.
+       update all heads that locally exist.
+
+\--dry-run::
+       Do everything except actually send the updates.

 
 \--force::
        Usually, the command refuses to update a remote ref that
 
 \--force::
        Usually, the command refuses to update a remote ref that


@@ -70,7 +73,7 @@ With '--all' flag, all refs that exist locally are transferred to
 the remote side.  You cannot specify any '<ref>' if you use
 this flag.
 
 the remote side.  You cannot specify any '<ref>' if you use
 this flag.
 

-Without '--all' and without any '<ref>', the refs that exist
+Without '--all' and without any '<ref>', the heads that exist

 both on the local side and on the remote side are updated.
 
 When one or more '<ref>' are specified explicitly, it can be either a
 both on the local side and on the remote side are updated.
 
 When one or more '<ref>' are specified explicitly, it can be either a


@@ -82,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.


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

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