gitconfig: autosquash = true

2016-05-26 18:55:46 -04:00 · 2016-05-26 18:55:46 -04:00 · 6be5c63c54
parent c0420298eb
commit 6be5c63c54
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -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]