From: Junio C Hamano <gitster@pobox.com>
To: "David A. Greene" <greened@obbligato.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/8] Fix Synopsis
Date: Tue, 01 Jan 2013 13:40:44 -0800 [thread overview]
Message-ID: <7vwqvw8tur.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1357012655-24974-5-git-send-email-greened@obbligato.org> (David A. Greene's message of "Mon, 31 Dec 2012 21:57:31 -0600")
"David A. Greene" <greened@obbligato.org> writes:
> From: "David A. Greene" <greened@obbligato.org>
>
> Fix the documentation of add to show that a repository can be
> specified along with a commit.
>
> Change "commit" to "refspec" in the synopsis for add.
>
> Suggested by Yann Dirson <dirson@bertin.fr>.
>
> Signed-off-by: David A. Greene <greened@obbligato.org>
> ---
> contrib/subtree/git-subtree.sh | 3 ++-
> contrib/subtree/git-subtree.txt | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
> index b8a807a..ad62dfb 100755
> --- a/contrib/subtree/git-subtree.sh
> +++ b/contrib/subtree/git-subtree.sh
> @@ -8,7 +8,8 @@ if [ $# -eq 0 ]; then
> set -- -h
> fi
> OPTS_SPEC="\
> -git subtree add --prefix=<prefix> <commit>
> +git subtree add --prefix=<prefix> <refspec>
Again, this is not <refspec> but <commit>.
> +git subtree add --prefix=<prefix> <repository> <refspec>
This is given to "fetch" and it seems to acccept any <refspec>, so
it is probably a good change (I didn't fully follow the codepath,
though).
> git subtree merge --prefix=<prefix> <commit>
> git subtree pull --prefix=<prefix> <repository> <refspec...>
> git subtree push --prefix=<prefix> <repository> <refspec...>
> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
> index ae420aa..89c2d6e 100644
> --- a/contrib/subtree/git-subtree.txt
> +++ b/contrib/subtree/git-subtree.txt
> @@ -9,7 +9,8 @@ git-subtree - Merge subtrees together and split repository into subtrees
> SYNOPSIS
> --------
> [verse]
> -'git subtree' add -P <prefix> <commit>
> +'git subtree' add -P <prefix> <refspec>
> +'git subtree' add -P <prefix> <repository> <refspec>
> 'git subtree' pull -P <prefix> <repository> <refspec...>
> 'git subtree' push -P <prefix> <repository> <refspec...>
> 'git subtree' merge -P <prefix> <commit>
next prev parent reply other threads:[~2013-01-01 21:41 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-01 3:57 git-subtree Patches to Apply David A. Greene
2013-01-01 3:57 ` [PATCH 1/8] Use %B for Split Subject/Body David A. Greene
2013-01-01 4:06 ` greened
2013-01-01 5:58 ` Junio C Hamano
2013-01-01 22:25 ` greened
2013-01-01 5:56 ` Junio C Hamano
2013-01-01 22:24 ` greened
[not found] ` <CAPYzjrTqmzuWoDg+zvLxwB7g6J4J2wbBqpL+UbHKRHcbjA4HrA@mail.gmail.com>
2013-01-07 15:00 ` 郑文辉(Techlive Zheng)
2013-01-07 15:18 ` 郑文辉(Techlive Zheng)
2013-01-07 16:53 ` Junio C Hamano
2013-01-01 21:25 ` Junio C Hamano
2013-01-01 22:29 ` greened
2013-01-02 0:30 ` Junio C Hamano
2013-01-08 10:40 ` greened
2013-01-01 3:57 ` [PATCH 2/8] Add --unannotate David A. Greene
2013-01-01 21:30 ` Junio C Hamano
2013-01-01 22:31 ` greened
2013-01-02 0:32 ` Junio C Hamano
2013-01-08 10:42 ` greened
2013-01-17 21:07 ` James Nylen
2013-01-22 8:44 ` greened
2013-01-22 16:04 ` Junio C Hamano
2013-01-01 3:57 ` [PATCH 3/8] Better Error Handling for add David A. Greene
2013-01-01 21:39 ` Junio C Hamano
2013-01-01 22:33 ` greened
2013-01-02 2:21 ` Junio C Hamano
2013-01-01 3:57 ` [PATCH 4/8] Fix Synopsis David A. Greene
2013-01-01 21:40 ` Junio C Hamano [this message]
2013-01-01 22:35 ` greened
2013-01-01 3:57 ` [PATCH 5/8] Honor DESTDIR David A. Greene
2013-01-01 21:42 ` Junio C Hamano
2013-01-01 22:36 ` greened
2013-01-01 3:57 ` [PATCH 6/8] Make the Manual Directory if Needed David A. Greene
2013-01-01 21:44 ` Junio C Hamano
2013-01-01 22:37 ` greened
2013-01-01 3:57 ` [PATCH 7/8] Ignore git-subtree David A. Greene
2013-01-01 21:44 ` Junio C Hamano
2013-01-01 3:57 ` [PATCH 8/8] Fix Documentation Typo David A. Greene
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vwqvw8tur.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=greened@obbligato.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).