All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Steve Frécinaux" <nudrema@gmail.com>
To: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [RFC] Re: git-svn: make git-svn commit-diff able to work without explicit arguments
Date: Wed, 03 Jan 2007 00:09:26 +0100	[thread overview]
Message-ID: <459AE626.9040001@gmail.com> (raw)
In-Reply-To: <20070102211339.GF17898@hades.madism.org>

Pierre Habouzit wrote:

>   Though an operation that I'd often like to do is to merge two (or
> more) patches as one, and reedit its entry, preferably as a merge of the
> two (or more) old logs.

Actually that's more or less what I wanted to achieve, just that it was 
less general.

Using the solutions that have been proposed in this thread (using 
git-cherry-pick -n and a work branch) looks satisfying for what I want 
to do. Then it's just a matter of cherry-picking the last "work" 
patches, commiting them as a whole in master and then using git-svn 
dcommit the regular way.

      parent reply	other threads:[~2007-01-02 23:09 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-02 18:23 [RFC] git-svn: make git-svn commit-diff able to work without explicit arguments Steve Frécinaux
2007-01-02 18:40 ` [RFC] " Pierre Habouzit
2007-01-02 19:18 ` [RFC] " Eric Wong
2007-01-02 20:30 ` Junio C Hamano
2007-01-02 21:13   ` [RFC] " Pierre Habouzit
2007-01-02 21:26     ` Brian Gernhardt
2007-01-02 21:58       ` Jakub Narebski
2007-01-02 22:27         ` Pierre Habouzit
2007-01-02 22:01     ` Junio C Hamano
2007-01-02 23:09     ` Steve Frécinaux [this message]

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=459AE626.9040001@gmail.com \
    --to=nudrema@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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.