From: Charles Bailey <charles@hashpling.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2009, #07; Wed, 28)
Date: Fri, 30 Jan 2009 16:32:41 +0000 [thread overview]
Message-ID: <20090130163241.GC26321@hashpling.org> (raw)
In-Reply-To: <20090129091611.GB10490@hashpling.org>
On Thu, Jan 29, 2009 at 09:16:11AM +0000, Charles Bailey wrote:
> On Thu, Jan 29, 2009 at 12:26:39AM -0800, Junio C Hamano wrote:
> > Charles Bailey <charles@hashpling.org> writes:
> >
> > > On Wed, Jan 28, 2009 at 06:06:45PM -0800, Junio C Hamano wrote:
> > >> * cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
> > >> + mergetool: respect autocrlf by using checkout-index
> > >>
> > >
> > > Can you hold off on merging this one? I now think that there's a
> > > cleaner way of doing this and I would like the opportunity for a
> > > rethink.
> >
> > Sure, it is not in 'master' yet.
> >
> > But it's in 'next', so incremental updates from now on, please.
> >
>
> OK, I've thought again and I still think that this patch is good.
Except that I was completely wrong. Please continue to hold off
merging into master until you've rolled in the future patch that fixes
mergetool in subdirectories which I'll clean-up and send later today.
Sorry about this.
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2009-01-30 16:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-29 2:06 What's cooking in git.git (Jan 2009, #07; Wed, 28) Junio C Hamano
2009-01-29 3:38 ` Jeff King
2009-01-29 3:51 ` Jeff King
2009-01-29 4:02 ` Jeff King
2009-01-29 4:22 ` Junio C Hamano
2009-01-29 11:27 ` Sverre Rabbelier
2009-01-29 11:37 ` Jeff King
2009-01-29 11:40 ` Pieter de Bie
2009-01-29 11:45 ` Sverre Rabbelier
2009-01-29 11:50 ` Jeff King
2009-01-29 12:20 ` Sverre Rabbelier
2009-01-30 4:51 ` Jeff King
2009-01-30 13:18 ` Johannes Schindelin
2009-01-30 16:26 ` Jeff King
2009-02-01 1:31 ` Junio C Hamano
2009-02-12 6:42 ` Junio C Hamano
2009-02-12 10:51 ` Sverre Rabbelier
2009-02-12 11:04 ` Johannes Schindelin
2009-02-12 21:04 ` Junio C Hamano
2009-02-12 21:51 ` Johannes Schindelin
2009-02-12 12:32 ` Jeff King
2009-01-29 11:48 ` Jeff King
2009-01-29 12:04 ` Nico -telmich- Schottelius
2009-01-30 4:59 ` Jeff King
2009-01-29 8:14 ` Charles Bailey
2009-01-29 8:26 ` Junio C Hamano
2009-01-29 9:16 ` Charles Bailey
2009-01-30 16:32 ` Charles Bailey [this message]
2009-02-01 17:45 ` Kirill Smelkov
2009-02-01 21:34 ` Junio C Hamano
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=20090130163241.GC26321@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.