X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_gitconfig;h=33e376087718543cbe79f8225f77edddb3755882;hb=baa785a7bd2832bbaee73620c5cd493cdf539778;hp=48089e73b0a3baf35576bbed8f85b4a7f45f2b67;hpb=204b97d20f63601c6c6540ccc4f20e4725023c05;p=sugar.git

diff --git a/dot-files/_gitconfig b/dot-files/_gitconfig
index 48089e7..33e3760 100644
--- 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,5 @@
 	draft = "!f(){ git push origin HEAD:refs/drafts/${1-master}; }; f"
 [push]
 	default = simple
+[pull]
+	rebase = true