vim: add cpp fswitch rules

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 805f94a5ee33253f89132afed474b5a228b06d75..21d2ea605d7bb6f3010886a1424f1375c9466c0f 100644 (file)
--- a/git/config
+++ b/git/config
@@ -26,3 +26,5 @@
        defaultToUpstream = true
 [mergetool]
        prompt = no
+[rebase]
+       autostash = true