aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortypebrook <typebrook@gmail.com>2019-08-14 17:49:19 +0800
committertypebrook <typebrook@gmail.com>2019-08-14 17:49:19 +0800
commitfb43491d084fbdcbc82ab7cc93b9cce0e37aa15b (patch)
tree0a30ea27c3748d255d2211f449f92ef0b7c2c21d
parent0c3ef7b6056f3e29f7a61bf695c4c7af1c53534e (diff)
update
-rw-r--r--alias14
-rw-r--r--tigrc3
2 files changed, 5 insertions, 12 deletions
diff --git a/alias b/alias
index a6ced46..e0a1952 100644
--- a/alias
+++ b/alias
@@ -66,20 +66,10 @@ alias df='df -h'
66 66
67# git 67# git
68alias g='git' 68alias g='git'
69alias gls='git log -S'
70alias gc='git clone' 69alias gc='git clone'
71alias gc1='git clone --depth=1' 70alias gc1='git clone --depth=1'
72alias check='git checkout' 71alias gls='git log -S'
73alias checkout='git checkout' 72alias cdgs='cd `git submodule status | cut -d" " -f3`' # cd to first submodule
74alias stash='git stash'
75alias commit='git commit'
76alias ca='git commit --amend'
77alias branch='git branch'
78alias pull='git pull'
79alias merge='git merge'
80alias push='git push'
81alias remote='git remote -v'
82alias rebase='git rebase'
83 73
84# docker 74# docker
85alias dp='docker ps' 75alias dp='docker ps'
diff --git a/tigrc b/tigrc
index 1d26e6d..7f1c391 100644
--- a/tigrc
+++ b/tigrc
@@ -72,6 +72,7 @@ bind main <C-J> :move-next-merge
72bind main <C-K> :move-prev-merge 72bind main <C-K> :move-prev-merge
73bind main gh :goto HEAD 73bind main gh :goto HEAD
74bind main ; :goto %(commit)^2 # go to second parent 74bind main ; :goto %(commit)^2 # go to second parent
75bind main 1 :goto $(git rev-list --all --children | grep "^%(commit)" | awk '{print $2}')
75 76
76# branch 77# branch
77bind main b none 78bind main b none
@@ -135,6 +136,7 @@ bind main Tn @git tag "%(prompt Enter tag name: )" %(commit)
135bind main TN !git tag "%(prompt Enter tag name: )" %(commit) -a 136bind main TN !git tag "%(prompt Enter tag name: )" %(commit) -a
136bind main Tm @sh -c 'git tag -d %(tag) && git tag "%(prompt Enter tag name: )" %(commit)' 137bind main Tm @sh -c 'git tag -d %(tag) && git tag "%(prompt Enter tag name: )" %(commit)'
137bind main TM @sh -c 'git cat-file -p %(tag) | sed -n \'6,$p\' | git tag -a -F - "%(prompt Enter tag name: )" && git tag -d %(tag)' 138bind main TM @sh -c 'git cat-file -p %(tag) | sed -n \'6,$p\' | git tag -a -F - "%(prompt Enter tag name: )" && git tag -d %(tag)'
139bind main Tc !git tag %(tag) %(tag)^{} -f -m "%(prompt Enter new content: )"
138bind main Ts >tig show %(tag) 140bind main Ts >tig show %(tag)
139bind main Td @git tag -d "%(prompt Delete tag: )" 141bind main Td @git tag -d "%(prompt Delete tag: )"
140bind main pt ?git push %(remote) %(tag) 142bind main pt ?git push %(remote) %(tag)
@@ -220,6 +222,7 @@ bind status <C-O> ?git am %(file)
220bind stash a ?git stash apply %(stash) 222bind stash a ?git stash apply %(stash)
221bind stash d ?>git stash drop %(stash) 223bind stash d ?>git stash drop %(stash)
222bind stash p ?>git stash pop %(stash) 224bind stash p ?>git stash pop %(stash)
225bind stash i +git rev-parse %(stash)
223 226
224# rename a stash 227# rename a stash
225bind stash n @sh -c "git stash drop %(stash) | \ 228bind stash n @sh -c "git stash drop %(stash) | \