From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Attempt to make git-checkout man page a bit more clear.
Date: Thu, 21 Dec 2006 10:34:07 +0100 [thread overview]
Message-ID: <emdk9f$c31$1@sea.gmane.org> (raw)
In-Reply-To: BAYC1-PASMTP071BBC53B5CE7917CE8DE1AECE0@CEZ.ICE
Sean wrote:
> On Wed, 20 Dec 2006 23:47:42 -0800
> Junio C Hamano <junkio@cox.net> wrote:
>
>> The 'restore from arbitrary tree-ish' form does not take -m as
>> far as I know.
>>
>> Although it might be interesting to do a single-file three-way
>> merge, I do not think the command is _checkout_ anymore once it
>> starts doing that.
>
> Yeah, I should have caught that. As well, your explanation makes me
> wonder if it makes sense to change <branch> in the third form to
> <tree-ish> ? Would you like an updated patch or will you just make
> the touch up(s) yourself?
Better not, because if I remember correctly
$ git checkout [--] <paths>...
would replace the contents of the named paths in your
working tree from the index, while
$ git checkout <commit-ish> [--] <paths>...
would replace the contents of the named paths in your
working tree from the given commit (given branch, perhaps given
tree-ish).
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
prev parent reply other threads:[~2006-12-21 9:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-21 6:53 [PATCH] Attempt to make git-checkout man page a bit more clear Sean
2006-12-21 7:47 ` Junio C Hamano
[not found] ` <20061221033100.b244573d.seanlkml@sympatico.ca>
2006-12-21 8:31 ` Sean
2006-12-21 9:34 ` Jakub Narebski [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='emdk9f$c31$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.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.
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).