From: Johan Herland <johan@herland.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes.Schindelin@gmx.de
Subject: Re: What's cooking in git.git (Oct 2009, #03; Mon, 19)
Date: Tue, 20 Oct 2009 02:06:56 +0200 [thread overview]
Message-ID: <200910200206.56616.johan@herland.net> (raw)
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
next prev parent reply other threads:[~2009-10-20 0:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-19 8:05 What's cooking in git.git (Oct 2009, #03; Mon, 19) Junio C Hamano
2009-10-19 9:25 ` Johan Herland
2009-10-19 18:58 ` Junio C Hamano
2009-10-20 0:06 ` Johan Herland [this message]
2009-10-22 15:33 ` Johannes Schindelin
2009-10-19 20:05 ` Erik Faye-Lund
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=200910200206.56616.johan@herland.net \
--to=johan@herland.net \
--cc=Johannes.Schindelin@gmx.de \
--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 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).