From: "Tim Visher" <tim.visher@gmail.com>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: "Junio C Hamano" <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: 'Theirs' merge between branches on a binary file.
Date: Sun, 28 Dec 2008 12:14:54 -0500 [thread overview]
Message-ID: <c115fd3c0812280914p61e3db34vb033f30b1e04da33@mail.gmail.com> (raw)
In-Reply-To: <49512E9A.5040902@lsrfire.ath.cx>
On Tue, Dec 23, 2008 at 1:31 PM, René Scharfe
<rene.scharfe@lsrfire.ath.cx> 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
prev parent reply other threads:[~2008-12-28 17:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-22 20:56 'Theirs' merge between branches on a binary file Tim Visher
2008-12-22 21:11 ` Junio C Hamano
2008-12-22 21:16 ` Tim Visher
2008-12-22 22:52 ` Junio C Hamano
2008-12-22 22:58 ` Tim Visher
2008-12-22 23:18 ` Junio C Hamano
2008-12-23 14:05 ` Tim Visher
2008-12-23 18:31 ` René Scharfe
2008-12-28 17:14 ` Tim Visher [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=c115fd3c0812280914p61e3db34vb033f30b1e04da33@mail.gmail.com \
--to=tim.visher@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
/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).