added ghc_home, cabal_home flags, branch config in git, sidharta->veitheller

2015-12-29 10:15:34 +01:00
parent 9a8e2a2cce
commit 7dba9df37f
24 changed files with 34 additions and 28 deletions
--- a/4
+++ b/4
@@ -29,6 +29,10 @@
 [apply]
    whitespace = fix

+[branch]
+    autosetupmerge = always
+    autosetuprebase = always
+
 [color]
    branch = auto
    diff = auto