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

Re: Recover from a bad push in StGit

From
CMCatalin Marinas <catalin.marinas@arm.com>
Date
Aug 21, 2006, 09:35 UTC
Message-ID
<tnxk652torl.fsf@arm.com>
In-Reply-To
<200608190030.47257.robin.rosenberg.lists@dewire.com>
Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:
Show 10 quoted lines
> 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?

"stg push --undo" (the same option for "refresh"; maybe I should add a separate "undo" command) resets the local changes and it restores the original boundaries of the patch (no information is lost). You could use the latest snapshot as it has some bug-fixes from release 0.10.

-- 
Catalin
Previous: Robin RosenbergNext: Robin Rosenberg
Message 3 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.