From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: RFC: Patch editing
Date: Mon, 26 Feb 2007 13:56:55 -0500 [thread overview]
Message-ID: <20070226185655.GB2108@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0702261949560.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Mon, 26 Feb 2007, Shawn O. Pearce wrote:
>
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > Therefore, I wrote this extremely simple script to sort out the order of
> > > commits, and possibly merging some. The script lets you edit the commit
> > > list upon start (reordering it, or removing commits), and then works on
> > > that list. It has three subcommands:
> >
> > This simple tool rocks. Thank you! ;-)
>
> I am undecided how to continue. Originally, I wanted to add an "--onto
> <commit>" option, and maybe an "edit" subcommand, but since Junio made me
> realize that it is more similar to git-rebase than I previously thought,
> and that they should merge, possibly in the form of a builtin...
Yea - this is a lot like rebase. I was also thinking that the -m
(merge mode) in rebase probably should be the only option offered.
I don't see why rebase should format-patch|am when we have the
whole commit available and merge-recursive does an excellent job
on tree level merges.
> But in order to merge the two, I have to learn about rebase's syntax first
> ;-)
Its easier than it looks. ;-)
--
Shawn.
next prev parent reply other threads:[~2007-02-26 18:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-25 21:59 RFC: Patch editing Johannes Schindelin
2007-02-26 13:18 ` Peter Baumann
2007-02-26 18:03 ` Shawn O. Pearce
2007-02-26 18:52 ` Johannes Schindelin
2007-02-26 18:56 ` Shawn O. Pearce [this message]
2007-02-26 19:51 ` Junio C Hamano
2007-02-27 7:14 ` Daniel Barkalow
2007-02-27 11:54 ` Johannes Schindelin
2007-02-27 17:35 ` Daniel Barkalow
2007-02-27 20:07 ` Johannes Schindelin
2007-02-27 22:07 ` Daniel Barkalow
2007-02-27 22:37 ` Johannes Schindelin
2007-02-28 10:13 ` Karl Hasselström
2007-03-01 23:30 ` Updated version, was " Johannes Schindelin
2007-03-01 23:59 ` Junio C Hamano
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=20070226185655.GB2108@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--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.