git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Chris Shoemaker <c.shoemaker@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Some ideas for StGIT
Date: Sat, 4 Aug 2007 16:22:36 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0708041618291.14781@racer.site> (raw)
In-Reply-To: <20070804141438.GA15821@pe.Belkin>

Hi,

On Sat, 4 Aug 2007, Chris Shoemaker wrote:

> IMO, here are some things that would probably be easier with an external
> patch stack:
> 
>    - directly editing the diff hunks
>    - moving single diff hunks between patches
> 
> Maybe there are others, too, but these are things I just don't do
> nearly as frequently as the things that git-rebase -i is good at.  (I
> use git-rebase -i *constantly*).

Good to hear!  (I almost missed this mail, since I usually skip the StGit 
mails.)

> > The "cd ..", "quilt push -a" and off I am. That 
> > the "database" of quilt is in a known format and I can hack on 
> > it with an editor is a plus for me :-)
> > [end of quote]
> 
> That sounds more like an argument from familiarity than anything else.
> Nobody (reasonable) directly hacks git's internal binary format.  The
> "known format" I can hack with my editor is just the content itself.
> Honestly, when you have commit-handling that is as good as git's,
> there's really very little appeal left to editing the diffs directly.

Of course, you _could_ just export the patches as one mbox, edit them, and 
reapply them:

	git format-patch --stdout HEAD~4 > mbox.txt
	$EDITOR mbox.txt # even moving hunks
	git reset --hard HEAD~4
	git am mbox.txt

If the need is great enough, it should be easy to hack something like this 
into git rebase -i.

Ciao,
Dscho

  reply	other threads:[~2007-08-04 15:23 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-03 17:50 Some ideas for StGIT Pavel Roskin
2007-08-03 18:14 ` Andy Parkins
2007-08-04  5:41   ` Pavel Roskin
2007-08-04  5:51     ` Shawn O. Pearce
2007-08-05  0:08       ` Pavel Roskin
2007-08-05  0:17       ` Jakub Narebski
2007-08-05  2:31         ` Shawn O. Pearce
2007-08-05  3:32           ` Junio C Hamano
2007-08-05 13:39           ` Josef Sipek
2007-08-05 13:56             ` Johannes Schindelin
2007-08-05 14:06               ` Josef Sipek
2007-08-05 14:15                 ` Johannes Schindelin
2007-08-05 14:57                   ` Josef Sipek
2007-08-04  8:08     ` Yann Dirson
2007-08-06 10:01       ` Catalin Marinas
2007-08-04 14:14     ` Chris Shoemaker
2007-08-04 15:22       ` Johannes Schindelin [this message]
2007-08-03 23:23 ` Yann Dirson
2007-08-06  9:49   ` Catalin Marinas
2007-08-06 13:26     ` Pavel Roskin
2007-08-06 15:19       ` Josef Sipek
2007-08-04  6:38 ` Theodore Tso
2007-08-04  8:16   ` Yann Dirson
2007-08-04 21:35   ` Josef Sipek
2007-08-05  0:12     ` Pavel Roskin
2007-08-06  9:36 ` Catalin Marinas
2007-08-06  9:56   ` Karl Hasselström
2007-08-06 12:42     ` Pavel Roskin
2007-08-06 13:52       ` Karl Hasselström
2007-08-23 14:09         ` Catalin Marinas
2007-08-23 14:34           ` Karl Hasselström
2007-08-06 17:17   ` Pavel Roskin

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=Pine.LNX.4.64.0708041618291.14781@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=c.shoemaker@cox.net \
    --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 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 NNTP newsgroup(s).