tree 72f49ba14e533ad4a589b171586999406591ac10
parent 098f19ed30c0bf028b858d1f66881cdc82e822ff
author Skyler Grey <minion@clicks.codes> 1709327554 +0000
committer Skyler Grey <minion@clicks.codes> 1709331914 +0000

Set git config pull.rebase to merges

We like rebases here, enough that we like having pull.rebase set by
default everywhere we go. Setting pull.rebase to merges differs from
plain pull.rebase = true in that it also rebases over merge commits so
they are linear. As we never want merge commits, this is a good default
for us

Change-Id: Ieba1a69aa5a6d0793d6ae4c490ba4d48f2917a09
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/514
Reviewed-by: Samuel Shuert <coded@clicks.codes>
Tested-by: Skyler Grey <minion@clicks.codes>