From: Catalin Marinas <catalin.marinas@arm.com>
To: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Recover from a bad push in StGit
Date: Mon, 21 Aug 2006 10:35:26 +0100 [thread overview]
Message-ID: <tnxk652torl.fsf@arm.com> (raw)
In-Reply-To: <200608190030.47257.robin.rosenberg.lists@dewire.com> (Robin Rosenberg's message of "Sat, 19 Aug 2006 00:30:46 +0200")
Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:
> 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
next prev parent reply other threads:[~2006-08-21 9:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-18 22:30 Recover from a bad push in StGit Robin Rosenberg
2006-08-19 0:11 ` Robin Rosenberg
2006-08-21 9:35 ` Catalin Marinas [this message]
2006-08-21 15:03 ` Robin Rosenberg
2006-08-21 15:55 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tnxk652torl.fsf@arm.com \
--to=catalin.marinas@arm.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg.lists@dewire.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).