[from now] 2014/08/19 14:02:15

diff --git a/.gitconfig b/.gitconfig
index f30e4c3..9d3321a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,6 +15,7 @@
     br = branch
     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`" # コンフリクトを全て開く
+    ls = ls-files    # under control
     uc = ls-files    # under control
     oc = ls-files -o # out of control
     ca = !git now && git reset --hard HEAD~ # cancel
[from now] 2014/08/19 16:21:59

diff --git a/.gitconfig b/.gitconfig
index 9d3321a..f207ac2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,7 +15,7 @@
     br = branch
     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`" # コンフリクトを全て開く
-    ls = ls-files    # under control
+    ls = ls-files
     uc = ls-files    # under control
     oc = ls-files -o # out of control
     ca = !git now && git reset --hard HEAD~ # cancel
@@ -39,6 +39,12 @@
 # アンステージングする
 # git reset HEAD
 #
+# svnのrevertに相当する
+# git checkout <file>
+#
+# なにも変わらない
+# git reset --soft HEAD
+#
 # コミットした事実だけを消す
 # git reset --soft HEAD^
 #
diff --git a/.gitignore b/.gitignore
index e1274b1..99c842a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,8 @@

 tags

-.vim/bundle/
-.vim/.netrwhist
+# .vim/bundle/
+# .vim/.netrwhist

 ############################################################
 # Xcode
diff --git a/.vimrc b/.vimrc
index d348e61..4137d87 100644
--- a/.vimrc
+++ b/.vimrc
@@ -327,6 +327,7 @@ nnoremap <silent> <Space>.   :<C-u>VimFilerBufferDir -quit<CR>
   " let g:unite_source_grep_recursive_opt = ''
 " endif

+let g:vimfiler_edit_action = 'tabopen'
 let g:vimfiler_as_default_explorer  = 1
 let g:vimfiler_safe_mode_by_default = 0
[from now] 2014/08/19 17:02:48

diff --git a/.gitignore b/.gitignore
index 99c842a..e1274b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,8 @@

 tags

-# .vim/bundle/
-# .vim/.netrwhist
+.vim/bundle/
+.vim/.netrwhist

 ############################################################
 # Xcode