[from now] 2013/04/19 15:46:00

diff --git a/.gitconfig b/.gitconfig
index c3894a2..fccbc56 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,7 +2,7 @@
     name = munkkya
     email = munkkya@example.com
 [color]
-    ui = auto
+	ui = auto
 [core]
     editor = vim
     excludesfile = ~/.gitignore
@@ -15,8 +15,9 @@
     br = branch
     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`" # コンフリクトを全て開く
-    oc = ls-files -o # Out of Control の意
-    ca = !git commit -am 'Temporary commit' && git reset --hard HEAD~
+    uc = ls-files    # Under Control
+    oc = ls-files -o # Out of Control
+    ca = !git now && git reset --hard HEAD~

 # from: http://iyukki.blog56.fc2.com/blog-entry-119.html
diff --git a/.vimrc b/.vimrc
index 735d43b..9dd881c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -83,6 +83,7 @@ Bundle 'hirono/vimdoc_ja'
 Bundle 'vim-scripts/mru.vim'
 Bundle 'vim-scripts/sudo.vim'
 Bundle 'vim-scripts/taglist.vim'
+Bundle 'Shougo/vimproc'
 Bundle 'Shougo/unite.vim'
 Bundle 'Shougo/vimfiler'
 Bundle 'thinca/vim-qfreplace'
@@ -97,7 +98,6 @@ filetype plugin indent on
 "****************************************
 " deleted plugins
 "****************************************
-" Bundle 'Shougo/vimproc'
 " Bundle 'Shougo/neocomplcache'
 " Bundle 'Shougo/neosnippet'
 " Bundle 'thinca/vim-quickrun'