From: Johannes Sixt <j6t@kdbg.org>
To: Andreas Schwab <schwab@linux-m68k.org>,
Shaun Jackman <sjackman@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase -i without altering the committer date
Date: Thu, 21 Apr 2016 07:23:26 +0200 [thread overview]
Message-ID: <571863CE.6090002@kdbg.org> (raw)
In-Reply-To: <87ega0eyvy.fsf@linux-m68k.org>
Am 20.04.2016 um 23:47 schrieb Andreas Schwab:
> Shaun Jackman <sjackman@gmail.com> writes:
>
>> I'd like to insert a commit between two commits without changing
>> the committer date or author date of that commit or the subsequent
>> commits.
>
> The easiest way to implement that is to add a graft to redirect the
> parent of the second commit to the inserted commit, then use git
> filter-branch to make the graft permanent.
This only inserts a new project state, but does not propagate the
changes brought in by the new commit to the subsequent commits. This
propagation of changes could also be done with filter-branch, but it may
be difficult depending on circumstances.
-- Hannes
next prev parent reply other threads:[~2016-04-21 5:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-20 20:24 git rebase -i without altering the committer date Shaun Jackman
2016-04-20 20:36 ` Junio C Hamano
2016-04-20 21:15 ` Shaun Jackman
2016-04-20 21:47 ` Andreas Schwab
2016-04-21 5:23 ` Johannes Sixt [this message]
2016-04-21 7:17 ` Johannes Schindelin
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=571863CE.6090002@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=schwab@linux-m68k.org \
--cc=sjackman@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 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).