@@ -7,6 +7,8 @@ branch = auto
 	diff = auto
 	status = auto
 	ui = true
+[pull]
+  rebase = true
 [push]
 	default = current
   followTags = true
@@ -16,7 +18,6 @@ st = status -sb
 	ci = commit
 	br = branch
 	co = checkout
-	ready = rebase -i @{u}
 	lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\?[0-9]\" | tail -n1'"
 	pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'"
 	lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'
@@ -52,4 +53,8 @@ program = gpg
 
 [merge "npm-merge-driver"]
 	name = automatically merge npm lockfiles
-	driver = npx npm-merge-driver merge %A %O %B %P+	driver = npx npm-merge-driver merge %A %O %B %P
+[remote]
+	autoSetupMerge = always
+[branch "master"]
+	rebase = false