Auto commit by The Sugar System.

[sugar.git] / dot-files / _gitconfig

diff --git a/dot-files/_gitconfig b/dot-files/_gitconfig
index 48089e73b0a3baf35576bbed8f85b4a7f45f2b67..015551f0e0fdc14f7928152a800f7ccca772a424 100644 (file)
--- a/dot-files/_gitconfig
+++ b/dot-files/_gitconfig
@@ -6,6 +6,7 @@
        ui = true
 [diff]
        renames = copies
+       compactionHeuristic = true
 [grep]
        lineNumber = true
 [http]
@@ -23,3 +24,7 @@
        draft = "!f(){ git push origin HEAD:refs/drafts/${1-master}; }; f"
 [push]
        default = simple
+[pull]
+       rebase = true
+[init]
+       defaultBranch = master