From 6be5c63c5486dac159046f4d8757d065de731659 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 26 May 2016 18:55:46 -0400 Subject: [PATCH] gitconfig: autosquash = true --- gitconfig | 2 ++ 1 file changed, 2 insertions(+) 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]