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

Re: [PATCH/RFC 0/2] rebase: add switches to control todo-list setup

From
Phil Hord <phil.hord@gmail.com>
Date
Apr 22, 2019, 19:20 UTC
Message-ID
<CABURp0pEB-3m=wbWsVc9C82d3Jf2UW4fXnsSZ+GnTHKWRJo0NQ@mail.gmail.com>
In-Reply-To
<CABURp0r9DBxoxLjjynNj-px7mFBA5--ZS7SoNniNu7MLPZkqwg@mail.gmail.com>
On Mon, Apr 22, 2019 at 12:16 PM Phil Hord <phil.hord@gmail.com> wrote:
Show 12 quoted lines
>
> I have the same need.  I plan to have some switch that invokes this
> "in-place rebase" behavior so that git can choose the upstream for me
> as `mergebase $sequence-edits`.  In fact, I want to make that the
> default for these switches, but that feels too surprising for the
> rebase command. I plan to progress like this:
>
>     # --in-place switch is not supported; manual upstream is given by user
>     git rebase --edit foo foo^
>
>      # --in-place switch is added; now we can say this
>      git rebase --edit foo --in-place

I originally CC'ed Denton on this thread because he recently added --keep-base. I initially hoped it would do something similar to --in-place, but on reading the patch discussion, I think it's for something different altogether. :-\ It's similar, though, in the same way that --fork-point is; which may be another way to say "not very."

Previous: Phil HordNext: Denton Liu
Message 7 of 11 in “rebase: add switches to control todo-list setup”
  1. 0/2 rebase: add switches to control todo-list setupPhil Hord, Apr 22, 2019
  2. 1/2 rebase: add switches for drop, edit and rewordPhil Hord, Apr 22, 2019
  3. 2/2 rebase: add --break switchPhil Hord, Apr 22, 2019
  4. Junio C HamanoApr 22, 2019
  5. Phillip WoodApr 22, 2019
  6. Phil HordApr 22, 2019
  7. Phil HordApr 22, 2019
  8. Denton LiuApr 22, 2019
  9. Junio C HamanoApr 23, 2019
  10. Phil HordApr 23, 2019
  11. Phil HordApr 22, 2019

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.