All of lore.kernel.org
 help / color / mirror / Atom feed
From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
To: Mike Rappazzo <rappazzo@gmail.com>,
	Jacob Keller <jacob.keller@gmail.com>
Cc: Philip Oakley <philipoakley@iee.org>,
	Konstantin Khomoutov <kostix+git@007spb.ru>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	Git List <git@vger.kernel.org>
Subject: Re: How to rebase when some commit hashes are in some commit messages
Date: Thu, 15 Oct 2015 10:12:41 +0200	[thread overview]
Message-ID: <561F5FF9.3070906@orange.fr> (raw)
In-Reply-To: <CANoM8SVAGQ4AL9wBiBMaAu0GvaotC8rhn-rWQhLjsyWr4DnXmw@mail.gmail.com>



On 13/10/2015 20:00, Mike Rappazzo wrote:
> It seems reasonable that this could be added as a feature of
> interactive rebase.  The todo list could be automatically adjusted to
> "reword" for those commits which are referring to other commits within
> the same rebase.  As each commit is re-written, a mapping could be
> kept of old sha1 -> new sha1.  Then when one of the reworded commits
> is being applied, the old sha1 -> new sha1 mapping could be used to
> add a line to the $COMMIT_MSG.

Even for non-interactive rebase, it could work.

  parent reply	other threads:[~2015-10-15  8:12 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-12 19:59 How to rebase when some commit hashes are in some commit messages Francois-Xavier Le Bail
2015-10-12 20:21 ` Matthieu Moy
2015-10-13  8:50   ` Francois-Xavier Le Bail
2015-10-13 13:00     ` Konstantin Khomoutov
2015-10-13 13:29       ` Philip Oakley
2015-10-13 17:07         ` Jacob Keller
2015-10-13 18:00           ` Mike Rappazzo
2015-10-13 19:24             ` Philip Oakley
2015-10-13 21:28               ` Jacob Keller
2015-10-13 23:06                 ` Philip Oakley
2015-10-15  8:12             ` Francois-Xavier Le Bail [this message]
2015-10-15  8:06           ` Francois-Xavier Le Bail
2015-10-15  7:44         ` Francois-Xavier Le Bail
2015-10-15  9:41           ` Johannes Schindelin
2015-10-16  8:01             ` Philip Oakley
2015-10-18 13:58           ` Thomas Koch
2015-10-18 16:23 ` Ævar Arnfjörð Bjarmason

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=561F5FF9.3070906@orange.fr \
    --to=devel.fx.lebail@orange.fr \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=jacob.keller@gmail.com \
    --cc=kostix+git@007spb.ru \
    --cc=philipoakley@iee.org \
    --cc=rappazzo@gmail.com \
    /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.