Re: Bring together merge and rebase

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 23, 2017, 23:01 UTC
Message-ID: <alpine.DEB.2.21.1.1712232353390.406@MININT-6BKU6QN.europe.corp.microsoft.com>
In-Reply-To: <20171223210141.GA24715@hpz.ecbaldwin.net>

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.

Both of these examples hint at a rather huge urge of some users to turn this feature off because the referenced commits may very well be throw-away commits in their case, making the newly-recorded information completely undesired.

Example: I am working on a topic branch. In the middle, I see a typo. I
commit a fix, continue to work on the topic branch. Later, I cherry-pick
that commit to a separate topic branch because I really don't think that
those two topics are related. Now I definitely do not want a reference of
the cherry-picked commit to the original one: the latter will never be
pushed to a public repository, and gc'ed in a few weeks.

Of course, that is only my wish, other users in similar situations may want that information. Demonstrating that you would be better served with an opt-in feature that uses notes rather than a baked-in commit header.

Ciao, Johannes