[from now] 2013/04/26 14:39:10

diff --git a/.gitconfig b/.gitconfig
index fccbc56..21b3616 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,11 +13,11 @@
     st = status
     di = diff HEAD
     br = branch
-    hi = log -10 --graph --all --color --pretty='%x09%h %cn%x09%s %Cred%d%Creset' # history
+    hi = log -20 --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`" # コンフリクトを全て開く
-    uc = ls-files    # Under Control
-    oc = ls-files -o # Out of Control
-    ca = !git now && git reset --hard HEAD~
+    uc = ls-files    # under control
+    oc = ls-files -o # out of control
+    ca = !git now && git reset --hard HEAD~ # cancel

 # from: http://iyukki.blog56.fc2.com/blog-entry-119.html
diff --git a/.vimrc b/.vimrc
index 171fdb2..bf5a93b 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 'vim-scripts/YankRing.vim'
 Bundle 'Shougo/vimproc'
 Bundle 'Shougo/unite.vim'
 Bundle 'Shougo/vimfiler'
@@ -266,6 +267,11 @@ let Tlist_Auto_Update = 1
 let Tlist_WinWidth = 30

 "****************************************
+" yankring
+let g:yankring_history_file = '.yankring'
+let g:yankring_n_keys = 'Y D'
+
+"****************************************
 " syntastic
 " let g:syntastic_mode_map = {
 "       \ 'mode': 'passive',