Re: [PATCH 4/8] Fix Synopsis

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 1, 2013, 21:40 UTC
Message-ID: <7vwqvw8tur.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1357012655-24974-5-git-send-email-greened@obbligato.org>

"David A. Greene" <greened@obbligato.org> writes:

Show 25 quoted lines

> 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).

Show 17 quoted lines

>  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>