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

Re: [PATCH (v2) 2/2] rebase -i: teach --onto A...B syntax

From
Avery Pennarun <apenwarr@gmail.com>
Date
Jan 8, 2010, 20:16 UTC
Message-ID
<32541b131001081216p27d7e29bu269755db895128@mail.gmail.com>
In-Reply-To
<7vtyux3bx1.fsf@alter.siamese.dyndns.org>
2010/1/7 Junio C Hamano <gitster@pobox.com>:
Show 7 quoted lines
> I am a bit unhappy about the duplication.  The text of this function is
> different from the one in "rebase" proper, but they implement essentially
> the same logic.  I was tempted to suggest having a common helper function,
> but as Dscho mentioned "rebase -i" implementation does not share much with
> "rebase" (even though it shares the external command line interface from
> the end user's point of view), and I don't see a readily available place
> (other than in git-sh-setup) to do so.

Is there a reason that non-interactive rebase can't just be implemented as "git rebase -i" but without actually launching an editor to edit the commit list?

This would resolve any other inconsistencies between the two as well, notably that non-interactive rebase sometimes refuses to do the rebase I requested because "Current branch master is up to date," while interactive rebase is willing to do it. (Personally I prefer the latter behaviour, since I don't like tools that think they're smarter than me :))

Avery
Previous: Johannes SixtNext: Sverre Rabbelier
Message 26 of 32 in “What's cooking in git.git (Jan 2010, #01; Mon, 04)”
  1. Junio C HamanoJan 4, 2010
  2. Matthieu MoyJan 4, 2010
  3. Junio C HamanoJan 4, 2010
  4. Johannes SixtJan 4, 2010
  5. Junio C HamanoJan 5, 2010
  6. Jeff KingJan 5, 2010
  7. Junio C HamanoJan 5, 2010
  8. Johannes SixtJan 5, 2010
  9. Junio C HamanoJan 6, 2010
  10. Johannes SixtJan 6, 2010
  11. Junio C HamanoJan 6, 2010
  12. Junio C HamanoJan 5, 2010
  13. Jeff KingJan 5, 2010
  14. Tay Ray ChuanJan 5, 2010
  15. Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano, Jan 5, 2010
  16. Johan HerlandJan 5, 2010
  17. Ilari LiusvaaraJan 5, 2010
  18. Junio C HamanoJan 6, 2010
  19. Nanako ShiraishiJan 6, 2010
  20. Johannes SchindelinJan 6, 2010
  21. Junio C HamanoJan 6, 2010
  22. 1/2 rebase: fix --onto A...B parsing and add testsNanako Shiraishi, Jan 7, 2010
  23. 2/2 rebase -i: teach --onto A...B syntaxNanako Shiraishi, Jan 7, 2010
  24. Junio C HamanoJan 7, 2010
  25. Johannes SixtJan 7, 2010
  26. Avery PennarunJan 8, 2010
  27. Sverre RabbelierJan 8, 2010
  28. Avery PennarunJan 8, 2010
  29. Sverre RabbelierJan 8, 2010
  30. A Large Angry SCMJan 8, 2010
  31. Johannes SchindelinJan 9, 2010
  32. Avery PennarunJan 9, 2010

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.