From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
To: git <git@vger.kernel.org>
Subject: Re: Recover from a bad push in StGit
Date: Sat, 19 Aug 2006 02:11:28 +0200 [thread overview]
Message-ID: <200608190211.29625.robin.rosenberg.lists@dewire.com> (raw)
In-Reply-To: <200608190030.47257.robin.rosenberg.lists@dewire.com>
lördag 19 augusti 2006 00:30 skrev Robin Rosenberg:
> 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?
It was so simple
stg status --reset;stg pop
does the job. Sorry about the noise.
>
> 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 prev parent reply other threads:[~2006-08-19 0:11 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 [this message]
2006-08-21 9:35 ` Catalin Marinas
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=200608190211.29625.robin.rosenberg.lists@dewire.com \
--to=robin.rosenberg.lists@dewire.com \
--cc=git@vger.kernel.org \
/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).