From: "Catalin Marinas" <catalin.marinas@gmail.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 16:55:28 +0100 [thread overview]
Message-ID: <b0943d9e0608210855m71c29a21y3d4941ec721e0737@mail.gmail.com> (raw)
In-Reply-To: <200608211703.59873.robin.rosenberg.lists@dewire.com>
On 21/08/06, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:
> måndag 21 augusti 2006 11:35 skrev Catalin Marinas:
> > "stg push --undo" (the same option for "refresh"; maybe I should add a
> > separate "undo" command) resets the local changes and it restores the
> Not necessarily, but a hint about --undo when push/pop fail would have
> helped me.
It is in the "stg help push" output but I could just display it when
the conflict happened.
> > 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.
>
> Does refresh --undo make me see the state of the patch like it was before last
> refresh, ie. stgit remembers the history of my patces? I thought it dropped
> the references as obsolete.
The references before the last command are stored and they can be
obtained by "stg id <patch>//(bottom|top).old". As long as you haven't
run a git prune on your repository, you should be able to undo the
refresh.
I'm (slowly) working on patch history support using reflogs and (when
ready) you should be able to retrieve a previous state of the patch as
long as you haven't pruned your GIT repository.
--
Catalin
prev parent reply other threads:[~2006-08-21 15:55 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
2006-08-21 15:03 ` Robin Rosenberg
2006-08-21 15:55 ` Catalin Marinas [this message]
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=b0943d9e0608210855m71c29a21y3d4941ec721e0737@mail.gmail.com \
--to=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).