From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 07 Feb 2009 23:31:47 GMT
Subject: Re: [PATCH] git-show.txt: mention that object path must be relative in EXAMPLES.
Message-ID: <m3mycxvn55.fsf@localhost.localdomain>
In-Reply-To: <87zlgxzydw.fsf@jondo.cante.net>

Jari Aalto <jari.aalto@cante.net> writes:

> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---
>  Documentation/git-show.txt |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
> index 48b612e..2a014cc 100644
> --- a/Documentation/git-show.txt
> +++ b/Documentation/git-show.txt
> @@ -57,7 +57,11 @@ git show v1.0.0^\{tree\}::
>  git show next~10:Documentation/README::
>  	Shows the contents of the file `Documentation/README` as
>  	they were current in the 10th last commit of the branch
> -	`next`.
> +	`next`. *Note:* the 'object' path must always be relative to git
> +	project root. This wouldn't have worked:
> +
> +	$ cd Documentation
> +	$ git show next~10:README

Actually that is not exactly true.  In the <tree-ish>:<path> the
'object' path must be always relative to <tree-ish), in this case
to "next~10", which means relative to project root at given commit
(important in case of subtree merge).

Although in practice <tree-ish> is always commit.

>  
>  git show master:Makefile master:t/Makefile::
>  	Concatenates the contents of said Makefiles in the head
> -- 
> 1.5.6.5
> 
> 

-- 
Jakub Narebski
Poland
ShadeHawk on #git