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

Recover from a bad push in StGit

From
Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date
Aug 18, 2006, 22:30 UTC
Message-ID
<200608190030.47257.robin.rosenberg.lists@dewire.com>
Hi,

I recently did some reordering of patches and goofed up (not totally, but anyway). I pushed a number of patches and forgot one in the middle resulting in a merge conflict. Pop won't work since I have local changes from the conflict and I don't want to resolve the conflict either since I didn't mean to push the patch at that point.

Is there a simple way of undoing a bad push?

In this case I had a fresh export do help me out so I could just delete the patches and re-import them again, but what if I didn't?

-- robin
Next: Robin Rosenberg
Message 1 of 5 in “Recover from a bad push in StGit”
  1. Robin RosenbergAug 18, 2006
  2. Robin RosenbergAug 19, 2006
  3. Catalin MarinasAug 21, 2006
  4. Robin RosenbergAug 21, 2006
  5. Catalin MarinasAug 21, 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.