X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/9cacd2663b603a65d07cb8e60935cb3bb13c63ae..6093fc3ea2f1981fa5305f5933eeaaaad2075312:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 9a55627..84d1192 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -7,6 +7,9 @@
 	attributesfile = @profile@/git/attributes
 	whitespace = trailing-space,space-before-tab,indent-with-non-tab
 
+[advice]
+	ignoredHook = false
+
 [user]
 	name = Mark Wooding
 	email = mdw@distorted.org.uk
@@ -40,8 +43,11 @@
 [rebase]
 	autosquash = true
 
+[pull]
+	rebase = false
+
 [push]
-	default = matching
+	default = upstream
 	followTags = true
 
 [format]