From: "David Kågedal" <davidk@lysator.liu.se>
To: git@vger.kernel.org
Subject: Re: [PATCH 1/4] Add 2 new contrib scripts.
Date: Fri, 01 Jun 2007 11:22:12 +0200 [thread overview]
Message-ID: <87fy5cqbaz.fsf@morpheus.local> (raw)
In-Reply-To: 20070531223423.6005.59088.stgit@gandelf.nowhere.earth
Yann Dirson <ydirson@altern.org> writes:
> diff --git a/contrib/stg-unnew b/contrib/stg-unnew
> new file mode 100755
> index 0000000..5ac8781
> --- /dev/null
> +++ b/contrib/stg-unnew
> @@ -0,0 +1,15 @@
> +#!/bin/sh
> +set -e
> +
> +# stg-unnew - sort of "reverse an 'stg new'"
> +
> +# Remove the current patch from the stack, keeping its contents as
> +# uncommitted changes.
> +
> +# Copyright (c) 2007 Yann Dirson <ydirson@altern.org>
> +# Subject to the GNU GPL, version 2.
> +
> +patch=$(stg top)
> +stg pop
> +stg pick --fold $patch
> +stg delete $patch
>
This is something I've been missing. But I'd call it "stg merge" or
something, since what it does is that it merges the top patch into the
patch below it. But since "merge" means something else to git, it
might not be the best choice.
--
David Kågedal
next prev parent reply other threads:[~2007-06-01 9:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-31 22:34 [StGIT PATCH 0/4] Rename detection, take 2 Yann Dirson
2007-05-31 22:34 ` [PATCH 1/4] Add 2 new contrib scripts Yann Dirson
2007-06-01 9:22 ` David Kågedal [this message]
2007-06-03 12:32 ` Karl Hasselström
2007-06-03 12:40 ` Yann Dirson
2007-05-31 22:34 ` [PATCH 2/4] Call external commands without a shell where possible Yann Dirson
2007-05-31 22:34 ` [PATCH 3/4] Make diff flags handling more modular Yann Dirson
2007-05-31 22:34 ` [PATCH 4/4] Add new --diff-opts/-O flag to diff- and status-related commands Yann Dirson
2007-06-04 22:15 ` Catalin Marinas
2007-06-05 6:47 ` Yann Dirson
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=87fy5cqbaz.fsf@morpheus.local \
--to=davidk@lysator.liu.se \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.