diff --git a/gitconfig b/gitconfig
index 047b127f..b43de4c8 100644
--- a/gitconfig
+++ b/gitconfig
@@ -22,6 +22,8 @@
 	tool = ediff
 [mergetool "ediff"]
 	cmd = emacsclient -c -a \"\"  --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
+[rebase]
+	autosquash = true
 [push]
 	default = simple
 [credential]