From: Johan Herland <johan@herland.net>
Date: Tue, 20 Oct 2009 00:06:56 GMT
Subject: Re: What's cooking in git.git (Oct 2009, #03; Mon, 19)
Message-ID: <200910200206.56616.johan@herland.net>
In-Reply-To: <7veioz1a8q.fsf@alter.siamese.dyndns.org>

On Monday 19 October 2009, Junio C Hamano wrote:
> Johan Herland <johan@herland.net> writes:
> > On Monday 19 October 2009, Junio C Hamano wrote:
> >> * jh/notes (2009-10-09) 22 commits.
> >>  - fast-import: Proper notes tree manipulation using the notes API
> >>  ...
> >>  - Introduce commit notes
> >>  (this branch uses sr/gfi-options.)
> >
> > Nope. This branch does not use sr/gfi-options. The jh/cvs-helper branch
> > does, though.
> 
> We should rebase jh/notes on top of v1.6.5 then.

We, as in me? or you?

AFAICS, when rebasing from 'next' to v1.6.5, there is only a single (easily 
resolved) merge conflict. If you prefer, I can resend the entire series 
rebased onto v1.6.5.


...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net