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

Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase

From
PWPhillip Wood <phillip.wood@talktalk.net>
Date
Aug 25, 2017, 11:54 UTC
Message-ID
<81909475-5801-c32b-efb5-a2a90c959a21@talktalk.net>
In-Reply-To
<xmqqtw0wx6b1.fsf@gitster.mtv.corp.google.com>
On 24/08/17 17:46, Junio C Hamano wrote:
Show 14 quoted lines
> Phillip Wood <phillip.wood@talktalk.net> writes:
> 
>> It could be expensive to check that the local modifications will not
>> interfere with the rebase - wouldn't it have to look at all the files
>> touched by each commit before starting? What do cherry-pick and am do
>> here when picking several commits?
> 
> Yes, so?
> 
> "I do not think of a way to implement it cheaply, so we forbid
> anybody from finding a clever optimization to implement it cheaply
> by adding a feature that will not work well with it when it
> happens?"
> 

Ouch, I think that is a rather unfair characterization of what I said and certainly does not reflect what I was trying to say. I was asking since cherry-pick and am can pick/apply multiple commits/patches and apparently allow the user to start with a dirty tree what do they do about checking that the applied commits/patches do not interfere with any local changes. As for "adding a feature that will not work well with it when it happens?" I suggested a possible solution in the message.

Anyway you're not convinced this feature is a good idea and no one else has commented so I'll drop it.

Phil
Previous: Junio C Hamano
Message 19 of 19 in “Add option to autostage changes when continuing a rebase”
  1. 0/5 Add option to autostage changes when continuing a rebasePhillip Wood, Jul 26, 2017
  2. 1/5 rebase --continue: add --autostage to stage unstaged changesPhillip Wood, Jul 26, 2017
  3. 3/5 Unify rebase amend message when HEAD has changedPhillip Wood, Jul 26, 2017
  4. 4/5 Add tests for rebase --continue --autostagePhillip Wood, Jul 26, 2017
  5. 5/5 Add rebase.continue.autostage config settingPhillip Wood, Jul 26, 2017
  6. 2/5 rebase -i: improve --continue --autostagePhillip Wood, Jul 26, 2017
  7. Junio C HamanoJul 26, 2017
  8. Junio C HamanoJul 26, 2017
  9. Junio C HamanoJul 26, 2017
  10. Phillip WoodJul 27, 2017
  11. Phillip WoodJul 27, 2017
  12. Junio C HamanoJul 27, 2017
  13. Phillip WoodAug 21, 2017
  14. Junio C HamanoAug 21, 2017
  15. Phillip WoodAug 22, 2017
  16. Junio C HamanoAug 22, 2017
  17. Phillip WoodAug 24, 2017
  18. Junio C HamanoAug 24, 2017
  19. Phillip WoodAug 25, 2017

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.