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

Re: git interactive rebase 'consume' command

From
SKStephen Kelly <steveire@gmail.com>
Date
Jan 20, 2013, 14:23 UTC
Message-ID
<kdgukd$jlm$1@ger.gmane.org>
In-Reply-To
<20130120141725.GL31172@serenity.lan>
John Keeping wrote:
Show 6 quoted lines
>> Any thoughts on that?
> 
> Are you aware of the "--autosqush" option to git-rebase (and the
> "rebase.autosquash" config setting)?  I find that using that combined
> with the "--fixup" option to git-commit makes this workflow a lot more
> intuitive.
Yes, I'm aware of it, but I think it's not related to the proposal I made. 
Mostly my proposal is about avoiding unnecessary conflict resolution.
Thanks,
Steve.
Previous: John KeepingNext: Junio C Hamano
Message 3 of 10 in “git interactive rebase 'consume' command”
  1. Stephen KellyJan 20, 2013
  2. John KeepingJan 20, 2013
  3. Stephen KellyJan 20, 2013
  4. Junio C HamanoJan 20, 2013
  5. Stephen KellyJan 20, 2013
  6. Junio C HamanoJan 20, 2013
  7. Jeff KingJan 21, 2013
  8. Stephen KellyJan 21, 2013
  9. Michael HaggertyJan 21, 2013
  10. Stephen KellyJan 21, 2013

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.