1 files changed, 28 insertions, 12 deletions
diff --git a/.gitconfig b/.gitconfig
index 6237e44..cffb771 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,6 @@
+[include]
+	path = ~/.gitconfig.local
+
 [advice]
 	addIgnoredFile = false
 	detachedHead = false
@@ -8,30 +11,43 @@
 	skippedCherryPicks = false
 	statusHints = false
 	statusUoption = false
-[help]
-	autoCorrect = never
-[user]
-	useConfigOnly = true
-[status]
-	relativePaths = false
+[checkout]
+	defaultRemote = origin
 [diff]
 	colorMoved = dimmed-zebra
 	colorMovedWS = allow-indentation-change
 	renames = copies
 	tool = vimdiff
+[fetch]
+	all = true
+	prune = true
+[help]
+	autoCorrect = never
+[interactive]
+	singleKey = true
 [merge]
 	log = true
 	tool = vimdiff
-[rebase]
-	stat = true
-[rerere]
-	enabled = true
 [push]
 	autoSetupRemote = true
 	default = current
 	followTags = true
-[tag]
-	gpgSign = true
+[rebase]
+	abbreviateCommands = true
+	missingCommitsCheck = error
+	stat = true
+[rerere]
+	autoUpdate = true
+	enabled = true
 [sendemail]
 	annotate = true
+	confirm = always
 	multiEdit = false
+	suppressFrom = true
+[status]
+	relativePaths = false
+[tag]
+	gpgSign = true
+	sort = version:refname
+[user]
+	useConfigOnly = true