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

Re: [PATCH] rebase --fix: interactive fixup mode

From
Clemens Buchacher <drizzd@aon.at>
Date
Jan 8, 2012, 22:19 UTC
Message-ID
<20120108221946.GA22680@ecki.lan>
In-Reply-To
<m3r4z9eu36.fsf@localhost.localdomain>
On Sun, Jan 08, 2012 at 01:57:03PM -0800, Jakub Narebski wrote:
Show 6 quoted lines
> 
> > In order to determine a suitable range automatically, it is a reasonable
> > heuristic to rebase onto the most recent merge commit.
> 
> Why not additionally / instead take into account remote-tracking
> branches for "push" remotes?

For me personally, remote-tracking does not work. I frequently branch locally, and even if I do branch from a remote branch, it's often not from a public branch, but rather my own private branch that I synchronize between repos and machines. So my remote-tracking configuration is usually an awful mess, and it does not feel like fixing it up manually would be worth the trouble.

As a result, I don't trust remote-tracking and I do not use any of the features associated with it. For my uses of rebase --fix it would therefore be counter-productive to consider remote-tracking information.

What I did consider was adding a comment to the list of "pick <commit>" that interactive rebase offers saying:

# older commits are already contained in the current upstream branch

Also, I often rewrite commits that are also contained in other branches. That typically happens when I am reworking a topic that has already been tested extensively. In that case I like to keep the original branch around for reference, even if I end up not using it eventually.

Previous: Jakub NarebskiNext: Jonathan Nieder
Message 3 of 13 in “rebase --fix: interactive fixup mode”
  1. rebase --fix: interactive fixup modeClemens Buchacher, Jan 8, 2012
  2. Jakub NarebskiJan 8, 2012
  3. Clemens BuchacherJan 8, 2012
  4. Jonathan NiederJan 8, 2012
  5. Clemens BuchacherJan 8, 2012
  6. Nguyen Thai Ngoc DuyJan 9, 2012
  7. Jonathan NiederJan 9, 2012
  8. Junio C HamanoJan 8, 2012
  9. Clemens BuchacherJan 9, 2012
  10. Michael HaggertyJan 9, 2012
  11. Neal KreitzingerJan 10, 2012
  12. Thomas RastJan 9, 2012
  13. Clemens BuchacherJan 9, 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.