[from now] 2013/02/21 04:24:21

diff --git a/.gitconfig b/.gitconfig
index a3d2487..b7c2481 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,6 +6,7 @@
 [core]
     editor = vim
     excludesfile = ~/.gitignore
+	autocrlf = input
 [alias]
     co = checkout
     ci = commit
@@ -15,7 +16,7 @@
     hi = log -10 --graph --all --color --pretty='%x09%h %cn%x09%s %Cred%d%Creset' # history
     er = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`" # コンフリクトを全て開く
 [push]
-	default = simple
+#	default = simple
 [tig "bind"]
     generic = g move-first-line
     generic = G move-last-line