aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--alias2
-rw-r--r--tigrc3
2 files changed, 4 insertions, 1 deletions
diff --git a/alias b/alias
index 10cee1c..eaea661 100644
--- a/alias
+++ b/alias
@@ -18,6 +18,7 @@ alias vl="vim -c ':CtrlPMRU<CR>'"
18alias vr='vim -R' 18alias vr='vim -R'
19alias vu='vim -u NONE' 19alias vu='vim -u NONE'
20alias vv='vim ~/vimwiki/index.md' 20alias vv='vim ~/vimwiki/index.md'
21alias vq='vim ~/buffer'
21alias cdv='cd ~/.vim_runtime' # amix/vimrc repo 22alias 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'
376alias cdT='cd ~/git/tilemaker' 377alias cdT='cd ~/git/tilemaker'
377alias cdngx='cd /etc/nginx' 378alias cdngx='cd /etc/nginx'
378alias stew='cd ~/git/mapstew' 379alias stew='cd ~/git/mapstew'
380alias sshs='ssh admin@52.199.215.221'
379 381
380TAIWAN_BBOX='118.1036,20.72799,122.9312,26.60305' 382TAIWAN_BBOX='118.1036,20.72799,122.9312,26.60305'
381TAIWAN_BBOX_V='20.72799,118.1036,26.60305,122.9312' 383TAIWAN_BBOX_V='20.72799,118.1036,26.60305,122.9312'
diff --git a/tigrc b/tigrc
index f6dcfe7..3a8cdbc 100644
--- a/tigrc
+++ b/tigrc
@@ -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
63set diff-highlight = true 63set diff-highlight = false
64 64
65# misc settings 65# misc settings
66set ignore-case = true 66set ignore-case = true
@@ -146,6 +146,7 @@ bind generic pD ?git push '%(prompt Delete from which remote? )' :'%(prompt Whic
146# fetch 146# fetch
147bind main <C-F> ?git fetch %(remote) 147bind main <C-F> ?git fetch %(remote)
148bind main gf ?git fetch '%(prompt Which remote? )' # Go to Fetch a specific remote 148bind main gf ?git fetch '%(prompt Which remote? )' # Go to Fetch a specific remote
149bind main gF ?git fetch '%(prompt Which remote? )' '%(prompt Which branch? )'
149bind main pu !git pull %(remote) %(branch) 150bind main pu !git pull %(remote) %(branch)
150bind main pf !git pull '%(prompt Pull from witch remote? )' %(branch) 151bind main pf !git pull '%(prompt Pull from witch remote? )' %(branch)
151bind main pU ?git pull --rebase 152bind main pU ?git pull --rebase