From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de
Subject: Re: core.autocrlf and merge conflict output
Date: Sun, 22 Jun 2008 22:23:59 -0400 [thread overview]
Message-ID: <485F093F.8020300@thewritingpot.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0806230259140.6439@racer>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Johannes Schindelin wrote:
> Funny. And I thought 1.5.6 contained that patch... Because 1.5.6 was
> merged by Steffen recently, and announced on both the msysgit list as well
> as this one.
And I'm wrong once again. My git checkout was on a detached head and
wasn't updating (apparently, I'm no good at reading error messages).
Switching back to master, pulling and then re-compiling fixed it.
While 99% of this is my fault, there might be a bug in netinstall.
However, I'm going to take that one to the msysgit list.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIXwk/qTO+fYacSNoRAkIhAJ9LU6jH5ThQbu0tSjmkbp7ynEyh5wCdHvbJ
pFVPllbiXjfLrgEYuY+uVlM=
=ZxbH
-----END PGP SIGNATURE-----
prev parent reply other threads:[~2008-06-23 2:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-22 22:08 core.autocrlf and merge conflict output Edward Z. Yang
2008-06-23 0:45 ` Junio C Hamano
2008-06-23 1:47 ` Edward Z. Yang
2008-06-23 1:54 ` Junio C Hamano
2008-06-23 2:00 ` Johannes Schindelin
2008-06-23 2:23 ` Edward Z. Yang [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=485F093F.8020300@thewritingpot.com \
--to=edwardzyang@thewritingpot.com \
--cc=Johannes.Schindelin@gmx.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.