From: "Karl Hasselström" <kha@treskal.com>
To: Chuck Lever <cel@citi.umich.edu>
Cc: Catalin Marinas <catalin.marinas@gmail.com>, git@vger.kernel.org
Subject: Re: [ANNOUNCE] pg - A patch porcelain for GIT
Date: Tue, 14 Feb 2006 17:07:47 +0100 [thread overview]
Message-ID: <20060214160747.GA6350@diana.vm.bytemark.co.uk> (raw)
In-Reply-To: <43F1F5CB.10402@citi.umich.edu>
On 2006-02-14 10:22:51 -0500, Chuck Lever wrote:
> Karl Hasselström wrote:
>
> > One thing I would like to see in stgit is the opposite of "stg
> > commit"; instead of converting patches to regular commits, take
> > the topmost regular commits and convert them to patches.
> >
> > For example, "stg uncommit foo bar baz" would -- regardless of any
> > existing patches, applied or not -- convert the top three regular
> > commits, with comments and all, to stgit patches called foo, bar,
> > and baz. These would be already applied, at the bottom of the
> > stack. I imagine all one would have to do is to modify some stgit
> > metadata, so the operation could be really cheap.
> >
> > Of course, "stg uncommit" is allowed to reject any commit with
> > more than one parent, since those can't be represented as stgit
> > patches.
> >
> > This would perhaps not add much power to an all-stgit workflow,
> > but it would be a really convenient way to edit recent git
> > history. Sort of like a more convenient rebase. And a great way to
> > lure new users. :-)
>
> i think you want "stg pick --reverse" ?
No, I literally want the opposite of "stg commit", so that the
sequence "stg commit; stg uncommit" has zero net effect.
Say we have the following situation (stack growing downward, of
course):
:
|
a
|
b
|
c <- bases/master
|
d <- applied patch "foo"
|
e <- applied patch "bar"; HEAD
|
f <- unapplied patch "baz"
|
:
In this situation, the hypothetical "stg uncommit" command would have
the following effect:
$ stg uncommit goo baa
:
|
a <- bases/master
|
b <- applied patch "baa"
|
c <- applied patch "goo"
|
d <- applied patch "foo"
|
e <- applied patch "bar"; HEAD
|
f <- unapplied patch "baz"
|
:
Note that HEAD is unchanged; the only thing that has happend is that
stgit has taken over the topmost two commits, and turned them into
patches. No git operations whatsoever have taken place; all stgit had
to do was change the value of bases/master and add bookkeeping
information for the two new patches.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
next prev parent reply other threads:[~2006-02-14 16:08 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-10 19:59 [ANNOUNCE] pg - A patch porcelain for GIT Shawn Pearce
2006-02-10 20:41 ` Greg KH
2006-02-10 21:04 ` Shawn Pearce
2006-02-10 23:20 ` Greg KH
2006-02-10 21:17 ` Petr Baudis
2006-02-10 21:38 ` Shawn Pearce
2006-02-10 21:47 ` Petr Baudis
2006-02-10 22:07 ` Junio C Hamano
2006-02-13 21:00 ` Petr Baudis
2006-02-14 9:26 ` Catalin Marinas
2006-02-14 10:08 ` Karl Hasselström
2006-02-14 15:22 ` Chuck Lever
2006-02-14 16:07 ` Karl Hasselström [this message]
2006-02-14 20:58 ` Chuck Lever
2006-02-14 22:29 ` Petr Baudis
2006-02-15 0:22 ` Sam Vilain
2006-02-15 0:35 ` Shawn Pearce
2006-02-15 1:14 ` Petr Baudis
2006-02-15 4:11 ` J. Bruce Fields
2006-02-15 6:54 ` Shawn Pearce
2006-02-15 19:45 ` J. Bruce Fields
2006-02-16 10:24 ` Junio C Hamano
2006-02-16 10:33 ` Catalin Marinas
2006-02-16 10:42 ` Fernando J. Pereda
2006-02-16 10:52 ` Junio C Hamano
2006-02-16 11:10 ` Catalin Marinas
2006-02-15 17:25 ` Catalin Marinas
2006-02-16 7:54 ` Karl Hasselström
2006-02-17 4:27 ` [PATCH 0/2] stg uncommit Karl Hasselström
2006-02-17 4:31 ` [PATCH 1/2] Update .git/refs/heads/base after patch deletion Karl Hasselström
2006-02-17 4:31 ` [PATCH 2/2] Add 'stg uncommit' command Karl Hasselström
2006-02-19 10:51 ` Catalin Marinas
2006-02-19 13:45 ` Karl Hasselström
2006-02-19 14:47 ` Karl Hasselström
2006-02-19 21:15 ` Sam Vilain
2006-02-20 17:20 ` Catalin Marinas
2006-02-20 17:30 ` Karl Hasselström
2006-02-20 22:49 ` Catalin Marinas
2006-02-21 7:55 ` Karl Hasselström
2006-02-15 10:11 ` [ANNOUNCE] pg - A patch porcelain for GIT Karl Hasselström
2006-02-15 10:42 ` Andreas Ericsson
2006-02-15 11:25 ` Karl Hasselström
2006-02-15 11:27 ` Karl Hasselström
2006-02-17 21:57 ` Catalin Marinas
2006-02-13 2:49 ` Sam Vilain
2006-02-13 3:29 ` Shawn Pearce
2006-02-13 4:40 ` Sam Vilain
2006-02-13 6:03 ` Shawn Pearce
2006-02-13 14:40 ` Catalin Marinas
2006-02-14 4:56 ` Shawn Pearce
2006-02-14 6:14 ` Shawn Pearce
2006-02-15 17:20 ` Catalin Marinas
2006-02-15 17:12 ` Catalin Marinas
2006-02-15 17:55 ` Shawn Pearce
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060214160747.GA6350@diana.vm.bytemark.co.uk \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=cel@citi.umich.edu \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).