Re: What's cooking in git.git (Oct 2009, #03; Mon, 19)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Monday 19 October 2009, Junio C Hamano wrote:
> Johan Herland <johan@xxxxxxxxxxx> 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@xxxxxxxxxxx>
www.herland.net
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]