diff --git a/git/.gitconfig b/git/.gitconfig
index 052c910..dc27055 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -28,6 +28,7 @@
 	cmd = 'nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
 	trustExitCode = true
 [rebase]
+	autosquash = true
 	autoStash = true
 [commit]
 	verbose = true
@@ -41,3 +42,5 @@
 	navigate = true
 	features = line-numbers decorations
 	whitespace-error-style = 22 reverse
+[advice]
+	addEmptyPathspec = false