retabed gitconfig

akiomik · Apr 4, 2013 · 4d4107f · 4d4107f
1 parent 7101a04
commit 4d4107f
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -1,21 +1,24 @@
 [user]
-	email = akiomik@gmail.com
+    email = akiomik@gmail.com
     name = "Akiomi Kamakura"
+[include]
+    path = .gitconfig.local
 [color]
-	ui = auto 
+    ui = auto
 [merge]
-	ff = false
+    ff = false
-	tool = vimdiff
+    tool = vimdiff
 [pull]
-	rebase = true
+    rebase = true
 [alias]
-	br = branch
+    br = branch
-	ci = commit -a
+    ci = commit -a
-	co = checkout
+    co = checkout
-	st = status
+    st = status
-	up = pull
+    up = pull
-	upstream = remote add upstream
+    upstream = remote add upstream
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
     lga = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 [core]
     editor = vim
+    pager = lv -c