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

diff --git a/.gitconfig b/.gitconfig
index ee3ea53..be946c3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,7 @@
 [core]
 	pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
 	quotePath = false
+	editor = sensible-editor +start
 [diff]
 	renames = copies
 [alias]
@@ -65,5 +66,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false