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

Re: odd behavior with git-rebase

From
NKNeal Kreitzinger <nkreitzinger@gmail.com>
Date
Mar 26, 2012, 21:53 UTC
Message-ID
<4F70E53E.6060608@gmail.com>
In-Reply-To
<20120326172028.GB12843@hmsreliant.think-freely.org>
On 3/26/2012 12:20 PM, Neil Horman wrote:
Show 11 quoted lines
> On Mon, Mar 26, 2012 at 10:12:48AM -0700, Junio C Hamano wrote:
>> Neil Horman<nhorman@tuxdriver.com>  writes:
>>
>>> I agree, I think perhaps adding an --allow-empty option to the rebase logic, so
>>> that empty commits (or perhaps just initially empty, as opposed to commits made
>>> empty) would be very beneficial.
>>
>> Yeah, that probably may make sense.
>>
> Ok, cool, I'll have a patch in a few days, thanks!
>

IMO, it seems like --allow-empty is an appropriate patch for git-rebase (non-interactive), and that git-rebase -i would need a command like "k"eep to distinguish which empty commits are not to be discarded and which empty commits are ok to discard automatically. git-rebase -i should allow explicit control on a commit by commit basis as opposed to blanket rules like "discard all empty commits" or "keep all empty commits" that apply to all commits in the rebase-to-do list based on a single cli option.

Maybe this is what you plan on doing. Maybe there is a better command name than "k"eep for this.

v/r, neal

Previous: Neil HormanNext: Phil Hord
Message 9 of 17 in “odd behavior with git-rebase”
  1. Neil HormanMar 23, 2012
  2. Jeff KingMar 23, 2012
  3. Phil HordMar 26, 2012
  4. Jeff KingMar 26, 2012
  5. Junio C HamanoMar 23, 2012
  6. Neil HormanMar 24, 2012
  7. Junio C HamanoMar 26, 2012
  8. Neil HormanMar 26, 2012
  9. Neal KreitzingerMar 26, 2012
  10. Phil HordMar 26, 2012
  11. Phil HordMar 26, 2012
  12. Neil HormanMar 26, 2012
  13. Jay SoffianMar 27, 2012
  14. Neal KreitzingerMar 26, 2012
  15. Neil HormanMar 26, 2012
  16. Phil HordMar 28, 2012
  17. Junio C HamanoMar 28, 2012

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.