[from now] 2013/04/18 03:59:10

diff --git a/.gitconfig b/.gitconfig
index 668ea1e..c3894a2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,8 @@
     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~
+

 # from: http://iyukki.blog56.fc2.com/blog-entry-119.html
 # ll = !git ls-files -cdmokt|perl -pe 's/\\/.*/\\//'|grep -v '/'
diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
index fab3a52..6afaca6 100644
--- a/.vim/after/ftplugin/python.vim
+++ b/.vim/after/ftplugin/python.vim
@@ -1,10 +1,10 @@

 " PEP 8 Indent rule
-setl cindent
-setl textwidth=80
-setl colorcolumn=80
+" setl cindent
+" setl textwidth=80
+" setl colorcolumn=80

 " Folding
-setl foldmethod=indent
-setl foldlevel=99
+" setl foldmethod=indent
+" setl foldlevel=99