Created
April 10, 2014 01:24
-
-
Save rhysd/10335465 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gitconfig b/gitconfig | |
index fa48b77..c44249e 100644 | |
--- a/gitconfig | |
+++ b/gitconfig | |
@@ -12,9 +12,11 @@ | |
cmv = commit -v | |
cmm = commit -m | |
cma = commit --amend | |
+ cmav = commit --amend -v | |
cl = clone | |
di = diff --color-words | |
dic = diff --cached --color-words | |
+ dicn = diff --cached | |
fe = fetch | |
lo = log --graph --pretty=format:'%C(Yellow)%h %C(Cyan)%ad %C(White)%s%C(Green)%d %C(Red)[%an]' --date=short | |
mg = merge | |
@@ -28,6 +30,7 @@ | |
re = remote | |
ad = add | |
adp = add -p | |
+ adu = add -u | |
co = checkout | |
cob = checkout -b | |
sh = show | |
diff --git a/vimrc b/vimrc | |
index d982718..97b1447 100644 | |
--- a/vimrc | |
+++ b/vimrc | |
@@ -159,6 +159,10 @@ if exists('+breakindent') | |
endif | |
" 一時ディレクトリではバックアップを取らない | |
set backupskip=/tmp/*,/private/tmp/* | |
+if ! isdirectory($HOME.'/.vim/swap') | |
+ call mkdir($HOME.'/.vim/swap', 'p') | |
+endif | |
+set directory=~/.vim/swap | |
" 一定時間カーソルを移動しないとカーソルラインを表示(ただし,ウィンドウ移動時 | |
" はなぜか切り替わらない |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment