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
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Sep 9, 2016, 12:21 UTC
Message-ID
<alpine.DEB.2.20.1609091421010.129229@virtualbox>
In-Reply-To
<CAN0XMO+diDLXUrxjNGnUi6oUEwkcGavEX8vyGWy2+Wju-N4WJQ@mail.gmail.com>
Hi Ralf,
On Wed, 7 Sep 2016, Ralf Thielow wrote:
Show 9 quoted lines
> 2016-09-07 11:28 GMT+02:00 Dennis Kaarsemaker <dennis@kaarsemaker.net>:
> > Hi Ralf,
> >
> > There are quite a few patch series in flight these days around
> > interactive rebase. Have you checked for conflicts with those?
> >
> 
> Thanks. I did not check against 'pu' when I created this patch but I'm able
> to apply without any conflicts.

Yeah, rewrites in C won't conflict with your patches. If you rebase interactively, the worst that will happen is that you update code that was moved into contrib/...

Ciao, Johannes

Previous: Ralf ThielowNext: Junio C Hamano
Message 6 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.