gitconfig

Songmu · May 5, 2016 · 9d82403 · 9d82403
1 parent cb00832
commit 9d82403
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -39,3 +39,9 @@
     pushinsteadof = "https://github.com/"
 [ghq]
     root = ~/dev/src
+[pull]
+    rebase = preserve
+[merge]
+    ff = false
+[credential]
+    helper = cache --timeout=3600