Merge branch 'maint'

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

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 60d53391d263e890ba1fa9183b46a72d090a5749..45c96435fa66ab4b1b57b6a860a2fc264321cfe4 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -9,8 +9,9 @@ git-push - Update remote refs along with associated objects
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-push' [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
-           [--repo=all] [-f | --force] [-v | --verbose] [<repository> <refspec>...]
+'git push' [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
+          [--repo=all] [-f | --force] [-v | --verbose]
+          [<repository> <refspec>...]

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


@@ -29,7 +30,7 @@ OPTIONS
        The "remote" repository that is destination of a push
        operation.  See the section <<URLS,GIT URLS>> below.
 
        The "remote" repository that is destination of a push
        operation.  See the section <<URLS,GIT URLS>> below.
 

-<refspec>::
+<refspec>...::

        The canonical format of a <refspec> parameter is
        `+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
        by the source ref, followed by a colon `:`, followed by
        The canonical format of a <refspec> parameter is
        `+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
        by the source ref, followed by a colon `:`, followed by


@@ -67,7 +68,8 @@ nor in any Push line of the corresponding remotes file---see below).
 
 --mirror::
        Instead of naming each ref to push, specifies that all
 
 --mirror::
        Instead of naming each ref to push, specifies that all

-       refs under `$GIT_DIR/refs/heads/` and `$GIT_DIR/refs/tags/`
+       refs under `$GIT_DIR/refs/` (which includes but is not
+       limited to `refs/heads/`, `refs/remotes/`, and `refs/tags/`)

        be mirrored to the remote repository.  Newly created local
        refs will be pushed to the remote end, locally updated refs
        will be force updated on the remote end, and deleted refs
        be mirrored to the remote repository.  Newly created local
        refs will be pushed to the remote end, locally updated refs
        will be force updated on the remote end, and deleted refs


@@ -105,7 +107,7 @@ nor in any Push line of the corresponding remotes file---see below).
 
 --thin::
 --no-thin::
 
 --thin::
 --no-thin::

-       These options are passed to `git-send-pack`.  Thin
+       These options are passed to 'git-send-pack'.  Thin

        transfer spends extra cycles to minimize the number of
        objects to be sent and meant to be used on slower connection.
 
        transfer spends extra cycles to minimize the number of
        objects to be sent and meant to be used on slower connection.
 


@@ -179,11 +181,11 @@ git push origin :experimental::
        Find a ref that matches `experimental` in the `origin` repository
        (e.g. `refs/heads/experimental`), and delete it.
 
        Find a ref that matches `experimental` in the `origin` repository
        (e.g. `refs/heads/experimental`), and delete it.
 

-git push origin master:satellite/master::
-       Find a ref that matches `master` in the source repository
-       (most likely, it would find `refs/heads/master`), and update
-       the ref that matches `satellite/master` (most likely, it would
-       be `refs/remotes/satellite/master`) in `origin` repository with it.
+git push origin master:satellite/master dev:satellite/dev::
+       Use the source ref that matches `master` (e.g. `refs/heads/master`)
+       to update the ref that matches `satellite/master` (most probably
+       `refs/remotes/satellite/master`) in the `origin` repository, then
+       do the same for `dev` and `satellite/dev`.

 
 git push origin master:refs/heads/experimental::
        Create the branch `experimental` in the `origin` repository
 
 git push origin master:refs/heads/experimental::
        Create the branch `experimental` in the `origin` repository