From: martin f. krafft Date: Mon, 6 Sep 2021 10:34:20 +0000 (+1200) Subject: include merge commits in rebase X-Git-Url: https://git.madduck.net/etc/git.git/commitdiff_plain/821d3028f391ed1659186b68659d902dd0a2713e?ds=inline include merge commits in rebase --- diff --git a/.gitconfig b/.gitconfig index ee3ea53..170d504 100644 --- a/.gitconfig +++ b/.gitconfig @@ -65,5 +65,7 @@ enabled = true [rebase] autosquash = true +[pull] + rebase = merges [advice] ignoredHook = false