Re: What's cooking in git.git (Jun 2013, #01; Sun, 2)
- From
Duy Nguyen <pclouds@gmail.com>
- Date
- Jun 3, 2013, 13:23 UTC
- Message-ID
- <CACsJy8DBLkU4h3-YAiXz-18YMmTChnRmPJFpEAEJEHhk4b-Uaw@mail.gmail.com>
- In-Reply-To
- <7vfvx0kqtn.fsf@alter.siamese.dyndns.org>
On Mon, Jun 3, 2013 at 6:58 AM, Junio C Hamano <gitster@pobox.com> wrote:
> [Graduated to "master"] > * tr/line-log (2013-04-22) 13 commits > (merged to 'next' on 2013-04-22 at 8f2c1de)
Should I resend nd/magic-pathspecs again now that all three topics that cause a lot of conflicts with it have graduated? Some conflicts (again) with pu but should be easy to resolve. The biggest one is jc/add-2.0-ignore-removal but that's basically a code deletion, I think you can handle it. -- Duy