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

Re: git-reset and clones

From
sean <seanlkml@sympatico.ca>
Date
Mar 16, 2006, 15:21 UTC
Message-ID
<BAYC1-PASMTP0354DF2E1D7C62E86C43D9AEE70@CEZ.ICE>
In-Reply-To
<44197C04.5080400@op5.se>

On Thu, 16 Mar 2006 15:53:56 +0100 Andreas Ericsson <ae@op5.se> wrote:

Show 8 quoted lines
> In mothership-repo:
> 	git checkout master
> 	git branch next-master ORIGIN
> 	git rebase next-master; # fix conflicts and commit
> 	git branch -d master
> 	git checkout -b master next-master
> 	git -d next-master
> 	git revert (the bad commits)

Downstream repos may still be broken afterward though; not much you can do about that unfortunately.

Sean
Previous: Andreas EricssonNext: Junio C Hamano
Message 6 of 12 in “git-reset and clones”
  1. Paul JakmaMar 16, 2006
  2. seanMar 16, 2006
  3. Paul JakmaMar 16, 2006
  4. Andreas EricssonMar 16, 2006
  5. Andreas EricssonMar 16, 2006
  6. seanMar 16, 2006
  7. Junio C HamanoMar 17, 2006
  8. Jon LoeligerMar 17, 2006
  9. Junio C HamanoMar 17, 2006
  10. Jon LoeligerMar 17, 2006
  11. Andreas EricssonMar 17, 2006
  12. Petr BaudisMar 19, 2006

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.