aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-25 22:25:20 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-25 22:25:20 -0800
commit7a0d911f116e437628035d7b07035dbff707a172 (patch)
treeeb8f48f25c35579370fd54d9b3594f45b8478920 /Documentation/git-push.txt
parent5c415311f743ccb11a50f350ff1c385778f049d6 (diff)
downloadgit-7a0d911f116e437628035d7b07035dbff707a172.tar.gz
git-7a0d911f116e437628035d7b07035dbff707a172.tar.xz
Documentation: simplify refspec format description
The refspec format description was a mix of regexp and BNF, making it very difficult to read. The format was also wrong: it did not show that each part of a refspec is optional in different situations. Rather than having a confusing grammar, just present the format in informal prose. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 7b27dc60b..ea45935a7 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -33,10 +33,11 @@ OPTIONS
of a remote (see the section <<REMOTES,REMOTES>> below).
<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 destination ref.
+ The format of a <refspec> parameter is an optional plus
+ `{plus}`, followed by the source ref <src>, followed
+ by a colon `:`, followed by the destination ref <dst>.
+ It is used to specify with what <src> object the <dst> ref
+ in the remote repository is to be updated.
+
The <src> side represents the source branch (or arbitrary
"SHA1 expression", such as `master~4` (four parents before the