From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Alexei Lozovsky <a.lozovsky@gmail.com>
Cc: "Carl Baldwin" <carl@ecbaldwin.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Bring together merge and rebase
Date: Thu, 4 Jan 2018 16:44:32 +0100 (STD) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1801041643400.31@MININT-6BKU6QN.europe.corp.microsoft.com> (raw)
In-Reply-To: <16725929-1BD2-44D3-8E71-E97C4A2C4034@gmail.com>
Hi,
On Sun, 24 Dec 2017, Alexei Lozovsky wrote:
> On Dec 24, 2017, at 01:01, Johannes Schindelin wrote:
> >
> > Hi Carl,
> >
> > On Sat, 23 Dec 2017, Carl Baldwin wrote:
> >
> >> I imagine that a "git commit --amend" would also insert a "replaces"
> >> reference to the original commit but I failed to mention that in my
> >> original post.
> >
> > And cherry-pick, too, of course.
>
> Why would it?
Because that's the command you use if you perform an interactive rebase
"manually". Or if you need to split a topic branch into two.
Ciao,
Johannes
next prev parent reply other threads:[~2018-01-04 15:44 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-23 6:10 Bring together merge and rebase Carl Baldwin
2017-12-23 18:59 ` Ævar Arnfjörð Bjarmason
2017-12-23 21:01 ` Carl Baldwin
2017-12-23 22:09 ` Ævar Arnfjörð Bjarmason
2017-12-26 0:16 ` Carl Baldwin
2017-12-26 1:28 ` Jacob Keller
2017-12-26 23:30 ` Igor Djordjevic
2017-12-26 17:49 ` Ævar Arnfjörð Bjarmason
2017-12-26 19:44 ` Carl Baldwin
2017-12-26 20:19 ` Paul Smith
2017-12-26 21:07 ` Carl Baldwin
2017-12-23 22:19 ` Randall S. Becker
2017-12-25 20:05 ` Carl Baldwin
2017-12-23 23:01 ` Johannes Schindelin
2017-12-24 14:13 ` Alexei Lozovsky
2018-01-04 15:44 ` Johannes Schindelin [this message]
2017-12-25 23:43 ` Carl Baldwin
2017-12-26 0:01 ` Randall S. Becker
2018-01-04 19:49 ` Martin Fick
2017-12-23 22:30 ` Johannes Schindelin
2017-12-25 3:52 ` Theodore Ts'o
2017-12-26 1:16 ` Carl Baldwin
2017-12-26 1:47 ` Jacob Keller
2017-12-26 6:02 ` Carl Baldwin
2017-12-26 8:40 ` Jacob Keller
2018-01-04 19:19 ` Martin Fick
2018-01-05 0:31 ` Martin Fick
2018-01-05 5:09 ` Carl Baldwin
2018-01-05 5:20 ` Carl Baldwin
2017-12-26 18:04 ` Theodore Ts'o
2017-12-26 20:31 ` Carl Baldwin
2018-01-04 20:06 ` Martin Fick
2018-01-05 5:06 ` Carl Baldwin
2018-01-04 19:54 ` Martin Fick
2018-01-05 4:08 ` Carl Baldwin
2018-01-05 20:14 ` Junio C Hamano
2018-01-06 17:29 ` Carl Baldwin
2018-01-06 17:32 ` Carl Baldwin
2018-01-06 21:38 ` Theodore Ts'o
2017-12-27 4:35 ` Carl Baldwin
2017-12-27 13:35 ` Alexei Lozovsky
2017-12-28 5:23 ` Carl Baldwin
2017-12-26 4:08 ` Mike Hommey
2017-12-27 2:44 ` Carl Baldwin
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=alpine.DEB.2.21.1.1801041643400.31@MININT-6BKU6QN.europe.corp.microsoft.com \
--to=johannes.schindelin@gmx.de \
--cc=a.lozovsky@gmail.com \
--cc=avarab@gmail.com \
--cc=carl@ecbaldwin.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).