[Freedombox-discuss] update fork branch

Diederik de Haas didi.debian at cknow.org
Fri Jun 25 21:54:00 BST 2021

On vrijdag 25 juni 2021 22:45:17 CEST Diederik de Haas wrote:
> use 'git merge --ff-only'

In this case 'git pull upstream master --ff-only' would be the command to use.
The '--ff-only' parameter is available for both merge and pull, which is not 
surprising as pull = fetch+merge
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: This is a digitally signed message part.
URL: <http://alioth-lists.debian.net/pipermail/freedombox-discuss/attachments/20210625/1ab47e42/attachment.sig>

More information about the Freedombox-discuss mailing list