Update .vim
Add IntroductionViewController

add introductions
login to facebook
[from now] 2013/06/03 20:10:03

diff --git a/.gitconfig b/.gitconfig
index 89014bd..7062d5f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,16 +3,16 @@
 	email = dictav@gmail.com
 [core]
 	editor = vim
-	pager = vimpager
+#	pager = vimpager
 	excludesfile = /Users/dictav/.global_gitignore
-[pager]
-	diff =
-	external =
+#[pager]
+#	diff =
+#	external =

-[merge]
-	tool = vimdiff
-[diff]
-	external = vimdiff4git
+#[merge]
+#	tool = vimdiff
+#[diff]
+#	external = vimdiff4git
 [color]
 	ui = auto
 [alias]
@@ -26,3 +26,5 @@
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
+[push]
+	default = simple
Change shell from bash to fish