Re: What's cooking in git.git (Jun 2011, #02; Sat, 11)
Hi,
On Sun, Jun 12, 2011 at 12:49 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
> Here are the topics that have been cooking. Commits prefixed with '-' are
> only in 'pu' while commits prefixed with '+' are in 'next'.
>
> --------------------------------------------------
> [Stalled]
>
> * jk/maint-merge-rename-create (2011-03-25) 3 commits
> - merge: turn on rewrite detection
> - merge: handle renames with replacement content
> - t3030: fix accidental success in symlink rename
>
> Peff wanted to reroll this. Perhaps will discard to make room for Elijah's
> merge-recursive series in the meantime.
Peff: Do you want any help rerolling, updating, reviewing, etc.? I
don't want to cause any undue problems with my merge-recursive series,
and besides, the idea you have in this series looks like it may be
interesting.