X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-push.txt;h=5b891105b2f9b425db61ee778a7f49eabf3ebcc5;hb=e246e3b880524446f9a269a00631d36a374eb63a;hp=365cfd4105870892306b6376de768b2f0d4b97a3;hpb=02d6fa5ce12d061b1c86f1b76d7bdac8c57e6f0c;p=git.git

diff --git a/git-push.txt b/git-push.txt
index 365cfd41..5b891105 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -16,18 +16,43 @@ DESCRIPTION
 Updates remote refs using local refs, while sending objects
 necessary to complete the given refs.
 
-You can make "interesting" things to happen on the repository
+You can make interesting things happen to a repository
 every time you push into it, by setting up 'hooks' there.  See
 documentation for gitlink:git-receive-pack[1].
 
 
 OPTIONS
 -------
-include::pull-fetch-param.txt[]
+<repository>::
+	The "remote" repository that is destination of a push
+	operation.  See the section <<URLS,GIT URLS>> below.
+
+<refspec>::
+	The canonical format of a <refspec> parameter is
+	`+?<src>:<dst>`; that is, an optional plus `+`, followed
+	by the source ref, followed by a colon `:`, followed by
+	the destination ref.
++
+The <src> side can be an
+arbitrary "SHA1 expression" that can be used as an
+argument to `git-cat-file -t`.  E.g. `master~4` (push
+four parents before the current master head).
++
+The local ref that matches <src> is used
+to fast forward the remote ref that matches <dst>.  If
+the optional plus `+` is used, the remote ref is updated
+even if it does not result in a fast forward update.
++
+Some short-cut notations are also supported.
++
+* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
+* A parameter <ref> without a colon is equivalent to
+  <ref>`:`<ref>, hence updates <ref> in the destination from <ref>
+  in the source.
 
 \--all::
-	Instead of naming each ref to push, specifies all refs
-	to be pushed.
+	Instead of naming each ref to push, specifies that all
+	refs be pushed.
 
 \--tags::
 	All refs under `$GIT_DIR/refs/tags` are pushed, in
@@ -35,11 +60,12 @@ include::pull-fetch-param.txt[]
 	line.
 
 -f, \--force::
-	Usually, the command refuses to update a local ref that is
-	not an ancestor of the remote ref used to overwrite it.
-	This flag disables the check.  What this means is that the
-	local repository can lose commits; use it with care.
+	Usually, the command refuses to update a remote ref that is
+	not a descendent 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.
 
+include::urls.txt[]
 
 Author
 ------