From: Junio C Hamano <gitster@pobox.com>
To: Anders Melchiorsen <mail@cup.kalibalik.dk>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] Documentation: simplify refspec format description
Date: Sun, 25 Jan 2009 22:24:06 -0800 [thread overview]
Message-ID: <7viqo2a8l5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1232927133-30377-2-git-send-email-mail@cup.kalibalik.dk> (Anders Melchiorsen's message of "Mon, 26 Jan 2009 00:45:31 +0100")
Anders Melchiorsen <mail@cup.kalibalik.dk> writes:
> diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
> index ebdd948..820c140 100644
> --- a/Documentation/pull-fetch-param.txt
> +++ b/Documentation/pull-fetch-param.txt
> @@ -5,10 +5,10 @@
> 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>.
> + Find various forms of refspecs in examples section.
> +
> The remote ref that matches <src>
> is fetched, and if <dst> is not empty string, the local
I think this is *much* nicer, but I do not think git-fetch.txt has
examples to fall back on.
The patch to git-push.txt would not have this issue; the exmaple is there
in the page itself.
But I think it might be even better to briefly describe what it means,
like this patch on top of yours does to git-push.txt. The fetch/pull side
already has the corresponding description immediately after that, so I'd
suggest just removing the reference to non-existing examples section.
I found your 2/3 and 3/3 good improvements.
Documentation/git-push.txt | 3 ++-
Documentation/pull-fetch-param.txt | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git i/Documentation/git-push.txt w/Documentation/git-push.txt
index 3fd4bbb..ea45935 100644
--- i/Documentation/git-push.txt
+++ w/Documentation/git-push.txt
@@ -36,7 +36,8 @@ OPTIONS
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>.
- Find various forms of refspecs in examples section.
+ 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
diff --git i/Documentation/pull-fetch-param.txt w/Documentation/pull-fetch-param.txt
index 820c140..f9811f2 100644
--- i/Documentation/pull-fetch-param.txt
+++ w/Documentation/pull-fetch-param.txt
@@ -8,12 +8,11 @@
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>.
- Find various forms of refspecs in examples section.
+
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.
+
prev parent reply other threads:[~2009-01-26 6:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-25 23:45 [PATCH 0/3] Documentation: refine refspec description Anders Melchiorsen
2009-01-25 23:45 ` [PATCH 1/3] Documentation: simplify refspec format description Anders Melchiorsen
2009-01-25 23:45 ` [PATCH 2/3] Documentation: more git push examples Anders Melchiorsen
2009-01-25 23:45 ` [PATCH 3/3] Documentation: rework src/dst description in git push Anders Melchiorsen
2009-01-26 6:24 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7viqo2a8l5.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mail@cup.kalibalik.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).