From: Catalin Marinas <catalin.marinas@gmail.com>
To: Pavel Roskin <proski@gnu.org>
Cc: Yann Dirson <ydirson@altern.org>, git <git@vger.kernel.org>,
Charles Lever <cel@citi.umich.edu>
Subject: Re: StGIT: "stg new" vs "stg new --force"
Date: Sat, 21 Jan 2006 18:24:05 +0000 [thread overview]
Message-ID: <b0943d9e0601211024s76528ce8m@mail.gmail.com> (raw)
In-Reply-To: <1137539762.12454.11.camel@dv>
On 17/01/06, Pavel Roskin <proski@gnu.org> wrote:
> I think if would be better to improve "stg fold" to work on arbitrary
> patches. This way, you prepare the patch in the editor (which would not
> be harder than finding hunk numbers) and fold it into the patch of your
> choice. stg should check that the stack remains valid, possibly doing
> trivial adjustments to the higher patches. The current tree should not
> be impacted.
Note that 'stg fold' uses git-apply-patch which doesn't take fuzzy
patches (a feature I began to like actually). Modifying the patch in
an editor might create some problems with applying.
--
Catalin
next prev parent reply other threads:[~2006-01-21 18:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-13 9:24 StGIT: "stg new" vs "stg new --force" Pavel Roskin
2006-01-13 9:34 ` Karl Hasselström
2006-01-16 8:18 ` Catalin Marinas
2006-01-17 17:01 ` Pavel Roskin
2006-01-17 21:57 ` Yann Dirson
2006-01-17 23:16 ` Pavel Roskin
2006-01-18 19:37 ` Yann Dirson
2006-01-19 0:49 ` Pavel Roskin
2006-01-19 21:38 ` Yann Dirson
2006-01-20 6:23 ` Pavel Roskin
2006-01-20 18:22 ` J. Bruce Fields
2006-01-24 5:30 ` Pavel Roskin
2006-01-24 17:54 ` J. Bruce Fields
2006-01-24 18:17 ` Pavel Roskin
2006-01-24 21:23 ` Catalin Marinas
2006-01-21 18:24 ` Catalin Marinas [this message]
2006-01-22 5:05 ` Pavel Roskin
2006-01-21 18:20 ` Catalin Marinas
2006-01-21 18:31 ` 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=b0943d9e0601211024s76528ce8m@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=cel@citi.umich.edu \
--cc=git@vger.kernel.org \
--cc=proski@gnu.org \
--cc=ydirson@altern.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.