Sean Whitton writes ("Bug#959759: dgit-maint-merge(7): Mention
--allow-unrelated-histories"):
> Is this what you mean:
>
> % dgit clone libopencsd
> % cd libopencsd
> % # add and fetch upstream remote
> % git merge -s ours --allow-unrelated-histories v
Hello,
On Tue 05 May 2020 at 12:19PM +01, Ian Jackson wrote:
> I think git has pretty much always wanted --allow-unrelated-histories
> for this situation. The safety catch is there to stop you
> accidentally making a frankenproject, but that doesn't apply here.
Actually only since 2016 (git
Package: dgit
Version: 9.10
Sometimes needed.
--
Sean Whitton
From 5e248c400d5df4a4425455678b7e92513bc5eb3c Mon Sep 17 00:00:00 2001
From: Sean Whitton
Date: Mon, 4 May 2020 17:24:16 -0700
Subject: [PATCH] dgit-maint-merge(7): Mention --allow-unrelated-histories
This won't come up often so
3 matches
Mail list logo
