aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortypebrook <typebrook@gmail.com>2019-03-29 11:20:56 +0800
committertypebrook <typebrook@gmail.com>2019-03-29 11:20:56 +0800
commit084c508bb1af3617c42c4f92e3e286b499cfa798 (patch)
treed5e0ac79f792f24cf690bcc97652c14ebc195eb5
parente767c607cfff3026d135c11815b23d87b31dbe0a (diff)
update
-rw-r--r--alias1
-rw-r--r--tigrc6
2 files changed, 4 insertions, 3 deletions
diff --git a/alias b/alias
index 79fe7ac..0d24167 100644
--- a/alias
+++ b/alias
@@ -8,6 +8,7 @@ alias zshrc='vim ~/.zshrc'
8 8
9# vim 9# vim
10alias v='vim' 10alias v='vim'
11alias vv='vim ~/vimwiki/index.wiki'
11alias vr='vim -R' 12alias vr='vim -R'
12alias amix-update='cd ~/.vim_runtime && git pull --rebase' 13alias amix-update='cd ~/.vim_runtime && git pull --rebase'
13 14
diff --git a/tigrc b/tigrc
index 610bd13..74b37b4 100644
--- a/tigrc
+++ b/tigrc
@@ -75,8 +75,8 @@ bind main pp ?git push
75bind main pP ?git push -u %(remote) %(branch):%(branch) 75bind main pP ?git push -u %(remote) %(branch):%(branch)
76 76
77# reset/rebase/revert 77# reset/rebase/revert
78bind main u ?git reset %(commit) --soft 78bind main u ?git reset %(commit)
79bind main U ?sh -c "git stash push -m 'deprecated from reset' && git reset %(commit) --hard" 79bind main U ?sh -c "git reset %(commit) && git stash push -m 'deprecated from reset'"
80bind main <C-r> !?git rebase -i %(commit) 80bind main <C-r> !?git rebase -i %(commit)
81bind main ! ?git revert %(commit) 81bind main ! ?git revert %(commit)
82 82
@@ -201,7 +201,7 @@ bind diff <Esc>p :?^diff --(git|cc)
201 201
202# edit tigrc 202# edit tigrc
203bind help e >sh -c "vim ~/.tigrc" 203bind help e >sh -c "vim ~/.tigrc"
204bind help E :source ~/.tigrc 204bind help R :source ~/.tigrc
205 205
206#==================== 206#====================
207# color 207# color