Merge branch 'rr/cvsexportcommit-w'

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

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 74a0da1ed49f5b3742e97a1475dc671496f481ea..4a68aaba342bd1155beb2ae72fd81c701e6c80eb 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -9,8 +9,8 @@ git-push - Update remote refs along with associated objects
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

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

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


@@ -48,7 +48,7 @@ even if it does not result in a fast forward update.
 Note: If no explicit refspec is found, (that is neither
 on the command line nor in any Push line of the
 corresponding remotes file---see below), then all the
 Note: If no explicit refspec is found, (that is neither
 on the command line nor in any Push line of the
 corresponding remotes file---see below), then all the

-refs that exist both on the local side and on the remote
+heads that exist both on the local side and on the remote

 side are updated.
 +
 `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
 side are updated.
 +
 `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.


@@ -61,7 +61,10 @@ the remote repository.
 
 \--all::
        Instead of naming each ref to push, specifies that all
 
 \--all::
        Instead of naming each ref to push, specifies that all

-       refs be pushed.
+       refs under `$GIT_DIR/refs/heads/` be pushed.
+
+\--dry-run::
+       Do everything except actually send the updates.

 
 \--tags::
        All refs under `$GIT_DIR/refs/tags` are pushed, in
 
 \--tags::
        All refs under `$GIT_DIR/refs/tags` are pushed, in


@@ -79,7 +82,7 @@ the remote repository.
 
 -f, \--force::
        Usually, the command refuses to update a remote ref that is
 
 -f, \--force::
        Usually, the command refuses to update a remote ref that is

-       not a descendant of the local ref used to overwrite it.
+       not an ancestor of the local ref used to overwrite it.

        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 
        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 


@@ -92,7 +95,7 @@ the remote repository.
        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.
 

--v::
+-v, \--verbose::

        Run verbosely.
 
 include::urls-remotes.txt[]
        Run verbosely.
 
 include::urls-remotes.txt[]


@@ -117,6 +120,12 @@ git push origin master:satellite/master::
        the ref that matches `satellite/master` (most likely, it would
        be `refs/remotes/satellite/master`) in `origin` repository with it.
 
        the ref that matches `satellite/master` (most likely, it would
        be `refs/remotes/satellite/master`) in `origin` repository with it.
 

+git push origin master:refs/heads/experimental::
+       Create the branch `experimental` in the `origin` repository
+       by copying the current `master` branch.  This form is usually
+       needed to create a new branch in the remote repository as
+       there is no `experimental` branch to match.
+

 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>, later rewritten in C
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>, later rewritten in C