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

Re: [PATCH v2] rebase -i: improve advice on bad instruction lines

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 7, 2016, 18:58 UTC
Message-ID
<xmqqr38vleps.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1473240491.20551.1.camel@kaarsemaker.net>
Dennis Kaarsemaker <dennis@kaarsemaker.net> writes:
> There are quite a few patch series in flight these days around
> interactive rebase. Have you checked for conflicts with those?

IIRC, Ralf's fix would need to be ported to C version, and when it happens, it won't just be a mere conflict but will disappear from the scripted version ;-)

But the C version is not anywhere near 'pu' yet and being rerolled, so I do not mind queuing it on 'pu' now merely as a reminder.

Previous: Johannes Schindelin
Message 7 of 7 in “rebase -i: improve advice on bad instruction lines”
  1. rebase -i: improve advice on bad instruction linesRalf Thielow, Sep 6, 2016
  2. Ralf ThielowSep 6, 2016
  3. rebase -i: improve advice on bad instruction linesRalf Thielow, Sep 6, 2016
  4. Dennis KaarsemakerSep 7, 2016
  5. Ralf ThielowSep 7, 2016
  6. Johannes SchindelinSep 9, 2016
  7. Junio C HamanoSep 7, 2016

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.