Re: Bring together merge and rebase

From: Alexei Lozovsky <a.lozovsky@gmail.com>
Date: Dec 24, 2017, 14:13 UTC
Message-ID: <16725929-1BD2-44D3-8E71-E97C4A2C4034@gmail.com>
In-Reply-To: <alpine.DEB.2.21.1.1712232353390.406@MININT-6BKU6QN.europe.corp.microsoft.com>

On Dec 24, 2017, at 01:01, Johannes Schindelin wrote:

Show 10 quoted lines

> 
> 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? In my mind, cherry-picking does not 'replace' or 'refine' commits, it copies them into other, unrelated branches (usually something like stable branches maintained separately from the mainline). If anything, cherry-pick could add a separate "cherry-picked from" reference which may be useful, I guess, for conflict resolution if two branches with the same commit are merged.

> 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.

Using notes also allows to test and evaluate this new feature without any changes to core git, using it as an extension at first.