"Tim Visher" [off-list ref] writes:
On Mon, Dec 22, 2008 at 5:52 PM, Junio C Hamano [off-list ref] wrote:
quoted
That sounds like "git checkout --theirs"...
I'm sorry, Junio. I don't mean to be dense but I can't find that in
the docs and when I execute it it comes back as an unknown command.
Hmph, I meant to point you at:
http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
I think you can use "git checkout-index --stage=3 path" if your git is
older than that one with the option.
v1.6.0.1-15-g38901a4 (checkout --ours/--theirs: allow checking out one
side of a conflicting merge, 2008-08-30) introduced the feature.
On Mon, Dec 22, 2008 at 6:18 PM, Junio C Hamano [off-list ref] wrote:
Hmph, I meant to point you at:
http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
Ah, yes. There it is. :)
I think you can use "git checkout-index --stage=3 path" if your git is
older than that one with the option.
v1.6.0.1-15-g38901a4 (checkout --ours/--theirs: allow checking out one
side of a conflicting merge, 2008-08-30) introduced the feature.
Apparently this was added, at least to the docs, only in the latest
release? That's kind of weird A) because the tag indicates 1.6.0.1,
not 0.6, and B) It's a pretty trivial operation in other VCSes.
Hmm... Maybe I'll try to updated the docs to make this feature a
little more visible.
Anyway, the checkout-index command does indeed work in the older
version. That's kind of what I was looking for. I'm now working on
compiling git under cygwin as the latest version cygwin installs for
you is 0.4!
Thanks for your help!
--
In Christ,
Timmy V.
http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail
On Tue, Dec 23, 2008 at 1:31 PM, René Scharfe
[off-list ref] wrote:
Have you seen msysgit (http://code.google.com/p/msysgit/), the easy
route to git on Windows? It has all you need to check out and compile
the latest version of git.
I have seen msysgit. I haven't spent too much time with it mainly
because I'm in denial that I have to work with Windows all day at
work. I'm going to have to look into it I think when I attempt to get
my team onto git in a little less than a month.
--
In Christ,
Timmy V.
http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail