From: Jakub Narebski <jnareb@gmail.com>
To: Jari Aalto <jari.aalto@cante.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-show.txt: mention that object path must be relative in EXAMPLES.
Date: Sat, 07 Feb 2009 15:31:47 -0800 (PST) [thread overview]
Message-ID: <m3mycxvn55.fsf@localhost.localdomain> (raw)
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
next prev parent reply other threads:[~2009-02-07 23:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-07 22:16 [PATCH] git-show.txt: mention that object path must be relative in EXAMPLES Jari Aalto
2009-02-07 23:31 ` Jakub Narebski [this message]
2009-02-08 4:59 ` Boyd Stephen Smith Jr.
2009-02-08 7:52 ` Jari Aalto
2009-02-08 8:47 ` Boyd Stephen Smith Jr.
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=m3mycxvn55.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/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