Add documentation for --track and --no-track to the git-branch docs.

[git.git] / Documentation / git-http-push.txt

diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 4b4a46169c79b90e22f5bde0b26888761c28c9c4..9afb860381369767a0a3f5295f588b75f559ff22 100644 (file)
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -8,7 +8,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-http-push' [--complete] [--force] [--verbose] <url> <ref> [<ref>...]
+'git-http-push' [--all] [--force] [--verbose] <url> <ref> [<ref>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -18,7 +18,7 @@ remote branch.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

---complete::
+--all::

        Do not assume that the remote repository is complete in its
        current state, and verify all objects in the entire local
        ref's history exist in the remote repository.
        Do not assume that the remote repository is complete in its
        current state, and verify all objects in the entire local
        ref's history exist in the remote repository.


@@ -34,6 +34,15 @@ OPTIONS
        Report the list of objects being walked locally and the
        list of objects successfully sent to the remote repository.
 
        Report the list of objects being walked locally and the
        list of objects successfully sent to the remote repository.
 

+-d, -D::
+       Remove <ref> from remote repository.  The specified branch
+       cannot be the remote HEAD.  If -d is specified the following
+       other conditions must also be met:
+
+       - Remote HEAD must resolve to an object that exists locally
+       - Specified branch resolves to an object that exists locally
+       - Specified branch is an ancestor of the remote HEAD
+

 <ref>...::
        The remote refs to update.
 
 <ref>...::
        The remote refs to update.
 


@@ -43,7 +52,7 @@ Specifying the Refs
 
 A '<ref>' specification can be either a single pattern, or a pair
 of such patterns separated by a colon ":" (this means that a ref name
 
 A '<ref>' specification can be either a single pattern, or a pair
 of such patterns separated by a colon ":" (this means that a ref name

-cannot have a colon in it).  A single pattern '<name>' is just a 
+cannot have a colon in it).  A single pattern '<name>' is just a

 shorthand for '<name>:<name>'.
 
 Each pattern pair consists of the source side (before the colon)
 shorthand for '<name>:<name>'.
 
 Each pattern pair consists of the source side (before the colon)