X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/24055ed0d1ca784b025e1eb26c1f9c60d597e089..eff1203c8331ea1ca22c3232c2ccf4012250baf8:/git/config diff --git a/git/config b/git/config index edd6bab..954a76a 100644 --- a/git/config +++ b/git/config @@ -36,9 +36,9 @@ [pull] rebase = interactive [branch "master"] - rebase = preserve + rebase = merges [branch "develop"] - rebase = preserve + rebase = merges [commit] verbose = true [alias]