summaryrefslogtreecommitdiffstats
path: root/pull-fetch-param.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-02-01 06:36:08 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-02-01 06:36:08 +0000
commit8b6e23b4a1acd44f3af2ecfed98fe44096a325c8 (patch)
tree657670631436145f858e27547bbfbc16ec5941b1 /pull-fetch-param.txt
parent543c5e0d33e2e508beb456c07ae5fc3b325d3a9b (diff)
downloadgit-htmldocs-8b6e23b4a1acd44f3af2ecfed98fe44096a325c8.tar.gz
Autogenerated HTML docs for v1.6.1.2-306-gc0f6f
Diffstat (limited to 'pull-fetch-param.txt')
-rw-r--r--pull-fetch-param.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/pull-fetch-param.txt b/pull-fetch-param.txt
index ebdd948cd..f9811f247 100644
--- a/pull-fetch-param.txt
+++ b/pull-fetch-param.txt
@@ -5,15 +5,14 @@
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>.
+
The remote ref that matches <src>
is fetched, and if <dst> is not empty string, the local
ref that matches it is fast forwarded using <src>.
-Again, if the optional plus `+` is used, the local ref
+If the optional plus `+` is used, the local ref
is updated even if it does not result in a fast forward
update.
+