git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What's cooking in git.git (Feb 2020, #04; Mon, 17)

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 22, 2020, 17:16 UTC
Message-ID
<xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CABPp-BE_ktNmDB43N_qijzYzhXvsK8Fi7TJQ7goHu+MzGvdpBQ@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 13 quoted lines
>> > [Stalled]
>> >
>> > * pw/advise-rebase-skip (2019-12-06) 9 commits
>> >   - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
>> >   - rebase: fix advice when a fixup creates an empty commit
>> > ...
>> The tip "rebase -i: leave CHERRY_PICK_HEAD when there are conflicts"
>> needs reworking and can be dropped (cf
>> <7e1b92f5-48df-e202-ebcc-5b15987a7d63@gmail.com>). The other RFC patch
>> "rebase: fix advice when a fixup creates an empty commit" [1] could do
>> with someone commenting on it (I've Cc'd dscho and Elijah). I think the
>
> I'll try to take a look early to middle of next week.

Thanks, both. I think the early ones except for those two make sense by themselves, so perhaps I'll advance them to 'next' independently of these two steps.

Previous: Elijah NewrenNext: Elijah Newren
Message 13 of 14 in “What's cooking in git.git (Feb 2020, #04; Mon, 17)”
  1. Junio C HamanoFeb 17, 2020
  2. Elijah NewrenFeb 18, 2020
  3. en/rebase-backend, was Re: What's cooking in git.git (Feb 2020, #04; Mon, 17)Johannes Schindelin, Feb 18, 2020
  4. Alban GruinFeb 26, 2020
  5. Elijah NewrenFeb 22, 2020
  6. Junio C HamanoFeb 22, 2020
  7. Taylor BlauFeb 19, 2020
  8. Eric SunshineFeb 19, 2020
  9. Junio C HamanoFeb 19, 2020
  10. Taylor BlauFeb 19, 2020
  11. Phillip WoodFeb 21, 2020
  12. Elijah NewrenFeb 22, 2020
  13. Junio C HamanoFeb 22, 2020
  14. Elijah NewrenFeb 26, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.