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

Instead of rebasing, etc....?

From
Dave Abrahams <dave@boostpro.com>
Date
May 6, 2010, 22:42 UTC
Message-ID
<loom.20100507T003055-527@post.gmane.org>

I often find myself pursuing a development branch that I'm pushing out to a public repo, and then wanting to go back a few commits and start the end of the branch anew.

o-o-o-o origin/dev
      \
       o-o-o dev

Of course then I want to push dev and move origin/dev to refer to it. So I delete and recreate origin/dev. That's essentially like rebasing, and all the advice says "don't do it." How bad is that, really, if it's my own development branch?

If I try to avoid doing that I guess I have to "merge" with the remote branch but discard all its changes?

o-o-o-o - - - -o origin/dev dev
       \      / 
        o-o-o 

Is there a shortcut for that? It would be nice if Git had a way to note that sort of "false parentage" (the dotted line above) explicitly; it's not really there logically; it just helps the workflows to move along smoothly.

Next: Dave Abrahams
Message 1 of 4 in “Instead of rebasing, etc....?”
  1. Dave AbrahamsMay 6, 2010
  2. Dave AbrahamsMay 6, 2010
  3. Raja R HarinathMay 10, 2010
  4. Ramkumar RamachandraMay 10, 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.