X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/dd768e5523542b20f62db5512586453b6cd4fbe5..d32cdc55c2f0cb9793d0074fe940e0776c463f61:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index ee3ea53..1978b30 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,9 @@
 [core]
 	pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
 	quotePath = false
+	editor = sensible-editor +start
+[init]
+	defaultBranch = main
 [diff]
 	renames = copies
 [alias]
@@ -28,8 +31,6 @@
 	driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
 	tool = vimdiff
-[gui]
-	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
 	branch = auto
 	diff = auto
@@ -65,5 +66,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false