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

Re: Repo cleanup problem

From
EKEugine Kosenko <eugine.kosenko@gmail.com>
Date
May 11, 2007, 09:32 UTC
Message-ID
<9909dee80705110232m5ef56517i542728ef8657971e@mail.gmail.com>
In-Reply-To
<vpqveezhjb0.fsf@bauges.imag.fr>
2007/5/11, Matthieu Moy <Matthieu.Moy@imag.fr>:
Show 7 quoted lines
> Branch before the garbage commit. Then, you can use git-rebase to
> replay the correct history on top of your new branch. Note that
> git-rebase will break merging if you already used merge: it does not
> "move" your old commits to your new branch, it instead creates new
> commits with the same changes at the old ones, in the new branch.
>
> That's probably what you've done already.

Almost that. Unfortunately, this simple way causes unexpected conflicts, so I need also to do sometimes 'git-checkout <tag> .' and recommit the changes to force the process.

Previous: Karl Hasselström
Message 4 of 4 in “Repo cleanup problem”
  1. Eugine KosenkoMay 11, 2007
  2. Matthieu MoyMay 11, 2007
  3. Karl HasselströmMay 11, 2007
  4. Eugine KosenkoMay 11, 2007

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.