Re: [PATCH 1/4] Add 2 new contrib scripts.

From: David Kågedal <davidk@lysator.liu.se>
Date: Jun 1, 2007, 09:22 UTC
Message-ID: <87fy5cqbaz.fsf@morpheus.local>
In-Reply-To: <20070531223423.6005.59088.stgit@gandelf.nowhere.earth>

Yann Dirson <ydirson@altern.org> writes:

Show 22 quoted lines

> 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