diff options
-rw-r--r-- | alias | 2 | ||||
-rw-r--r-- | tigrc | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -18,6 +18,7 @@ alias vl="vim -c ':CtrlPMRU<CR>'" | |||
18 | alias vr='vim -R' | 18 | alias vr='vim -R' |
19 | alias vu='vim -u NONE' | 19 | alias vu='vim -u NONE' |
20 | alias vv='vim ~/vimwiki/index.md' | 20 | alias vv='vim ~/vimwiki/index.md' |
21 | alias vq='vim ~/buffer' | ||
21 | alias cdv='cd ~/.vim_runtime' # amix/vimrc repo | 22 | alias cdv='cd ~/.vim_runtime' # amix/vimrc repo |
22 | 23 | ||
23 | # for custom scripts | 24 | # for custom scripts |
@@ -376,6 +377,7 @@ alias cdma='cd ~/git/mapstew-android' | |||
376 | alias cdT='cd ~/git/tilemaker' | 377 | alias cdT='cd ~/git/tilemaker' |
377 | alias cdngx='cd /etc/nginx' | 378 | alias cdngx='cd /etc/nginx' |
378 | alias stew='cd ~/git/mapstew' | 379 | alias stew='cd ~/git/mapstew' |
380 | alias sshs='ssh admin@52.199.215.221' | ||
379 | 381 | ||
380 | TAIWAN_BBOX='118.1036,20.72799,122.9312,26.60305' | 382 | TAIWAN_BBOX='118.1036,20.72799,122.9312,26.60305' |
381 | TAIWAN_BBOX_V='20.72799,118.1036,26.60305,122.9312' | 383 | TAIWAN_BBOX_V='20.72799,118.1036,26.60305,122.9312' |
@@ -60,7 +60,7 @@ bind generic gL ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"} | |||
60 | # highlight diff without +/- | 60 | # highlight diff without +/- |
61 | # set diff-show-signs = false | 61 | # set diff-show-signs = false |
62 | # set diff_column_highlight = ALL | 62 | # set diff_column_highlight = ALL |
63 | set diff-highlight = true | 63 | set diff-highlight = false |
64 | 64 | ||
65 | # misc settings | 65 | # misc settings |
66 | set ignore-case = true | 66 | set ignore-case = true |
@@ -146,6 +146,7 @@ bind generic pD ?git push '%(prompt Delete from which remote? )' :'%(prompt Whic | |||
146 | # fetch | 146 | # fetch |
147 | bind main <C-F> ?git fetch %(remote) | 147 | bind main <C-F> ?git fetch %(remote) |
148 | bind main gf ?git fetch '%(prompt Which remote? )' # Go to Fetch a specific remote | 148 | bind main gf ?git fetch '%(prompt Which remote? )' # Go to Fetch a specific remote |
149 | bind main gF ?git fetch '%(prompt Which remote? )' '%(prompt Which branch? )' | ||
149 | bind main pu !git pull %(remote) %(branch) | 150 | bind main pu !git pull %(remote) %(branch) |
150 | bind main pf !git pull '%(prompt Pull from witch remote? )' %(branch) | 151 | bind main pf !git pull '%(prompt Pull from witch remote? )' %(branch) |
151 | bind main pU ?git pull --rebase | 152 | bind main pU ?git pull --rebase |