aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortypebrook <typebrook@gmail.com>2019-05-23 17:25:49 +0800
committertypebrook <typebrook@gmail.com>2019-05-23 17:25:49 +0800
commite39d5683f70df5e986ce70267e52eba5f0ad074f (patch)
tree435cba8fdb12eeca150a3703e12f05e477eab4ff
parente64f2b341ffeacd543876cd80cb1254be549950e (diff)
update
-rw-r--r--alias1
-rw-r--r--tigrc16
2 files changed, 9 insertions, 8 deletions
diff --git a/alias b/alias
index 526dd85..123820e 100644
--- a/alias
+++ b/alias
@@ -1,5 +1,6 @@
1# settings 1# settings
2alias al='vim ~/.bash_aliases && source ~/.bash_aliases' 2alias al='vim ~/.bash_aliases && source ~/.bash_aliases'
3alias all='source ~/.bash_aliases'
3alias vimrc='vim ~/.vimrc' 4alias vimrc='vim ~/.vimrc'
4alias bashrc='vim ~/.bashrc' 5alias bashrc='vim ~/.bashrc'
5alias tigrc='vim ~/.tigrc' 6alias tigrc='vim ~/.tigrc'
diff --git a/tigrc b/tigrc
index 4843a36..7d637ab 100644
--- a/tigrc
+++ b/tigrc
@@ -6,6 +6,7 @@
6# geineric 6# geineric
7#==================== 7#====================
8bind generic g none 8bind generic g none
9bind generic gp view-grep
9bind generic gg move-first-line 10bind generic gg move-first-line
10bind generic G move-last-line 11bind generic G move-last-line
11bind generic S none 12bind generic S none
@@ -19,19 +20,18 @@ bind generic xx +sh -c "echo -n %(commit) | head -c7 | xclip -sel c && echo Comm
19bind generic xc +sh -c "echo -n %(commit) | xclip -sel c && echo Full Commit Clipped!" 20bind generic xc +sh -c "echo -n %(commit) | xclip -sel c && echo Full Commit Clipped!"
20bind generic xrb +sh -c "echo -n %(branch) | xclip -sel c && echo Branch Clipped!" 21bind generic xrb +sh -c "echo -n %(branch) | xclip -sel c && echo Branch Clipped!"
21bind generic xrB +sh -c "echo -n %(remote):%(branch) | xclip -sel c && echo Remote Branch Clipped!" 22bind generic xrB +sh -c "echo -n %(remote):%(branch) | xclip -sel c && echo Remote Branch Clipped!"
22bind generic xf +sh -c "echo -n %(file) | xclip -sel c && echo File Clipped"
23bind generic xrt +sh -c "echo -n %(tag) | xclip -sel c && echo tag Clipped" 23bind generic xrt +sh -c "echo -n %(tag) | xclip -sel c && echo tag Clipped"
24bind generic xf +sh -c "echo -n %(file) | xclip -sel c && echo File Clipped"
24bind generic xb +sh -c "echo -n %(blob) | head -c7 | xclip -sel c && echo Blob Clipped" 25bind generic xb +sh -c "echo -n %(blob) | head -c7 | xclip -sel c && echo Blob Clipped"
25bind generic xB +sh -c "echo -n %(blob) | xclip -sel c && echo Full Blob Clipped" 26bind generic xB +sh -c "echo -n %(blob) | xclip -sel c && echo Full Blob Clipped"
26 27
27bind generic gp view-grep
28
29# toggle case sensitive for search 28# toggle case sensitive for search
30bind generic w :toggle ignore-case 29bind generic w :toggle ignore-case
31 30
32# refresh like modern browser 31# refresh like modern browser
33bind generic <C-R> refresh 32bind generic <C-R> refresh
34# apply tigrc settings 33# apply tigrc settings
34
35bind generic R none 35bind generic R none
36bind generic R :source ~/.tigrc 36bind generic R :source ~/.tigrc
37 37
@@ -68,7 +68,7 @@ bind main <C-F> :toggle commit-title-refs
68bind main <C-J> :move-next-merge 68bind main <C-J> :move-next-merge
69bind main <C-K> :move-prev-merge 69bind main <C-K> :move-prev-merge
70bind main gh :goto HEAD 70bind main gh :goto HEAD
71bind main ; :goto %(commit)^2 71bind main ; :goto %(commit)^2 # go to second parent
72 72
73# branch 73# branch
74bind main b none 74bind main b none
@@ -104,15 +104,15 @@ bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current
104# push 104# push
105bind main p none # override default pager binding 105bind main p none # override default pager binding
106bind main pp ?git push 106bind main pp ?git push
107bind main pF ?git push -f
108bind main pP ?git push -u %(remote) %(branch):%(branch) 107bind main pP ?git push -u %(remote) %(branch):%(branch)
108bind main pF ?git push -f
109bind main pr ?git push -u '%(prompt Which remote? )' %(branch):%(branch) 109bind main pr ?git push -u '%(prompt Which remote? )' %(branch):%(branch)
110bind main pd ?git push %(remote) :%(branch) 110bind main pd ?git push %(remote) :%(branch)
111bind main pD ?git push '%(prompt Which remote? )' :'%(prompt Which branch? )' 111bind main pD ?git push '%(prompt Which remote? )' :'%(prompt Which branch? )'
112 112
113# fetch 113# fetch
114bind main F ?git fetch %(remote) # Go to Fetch 114bind main F ?git fetch %(remote) # Go to Fetch
115bind main gf ?git fetch '%(prompt Which remote? )' # Go to Fetch certain remote 115bind main gf ?git fetch '%(prompt Which remote? )' # Go to Fetch a specific remote
116bind main pu ?git pull 116bind main pu ?git pull
117bind main pU ?git pull '%(prompt Which remote? )' %(branch):%(branch) 117bind main pU ?git pull '%(prompt Which remote? )' %(branch):%(branch)
118 118
@@ -176,7 +176,7 @@ set blame-view = author:abbreviated date:relative id:yes,color line-number:yes t
176#==================== 176#====================
177# blob view 177# blob view
178#==================== 178#====================
179bind blob m >tig %(file) 179bind blob m >tig -- %(file)
180 180
181#==================== 181#====================
182# status view 182# status view
@@ -202,7 +202,7 @@ bind status gc @git clean -f
202bind status Ba @git rebase --abort 202bind status Ba @git rebase --abort
203bind status Bc @git rebase --continue 203bind status Bc @git rebase --continue
204bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" 204bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\""
205bind status Tu @git update-index --assume-unchanged %(file) 205bind status gu @git update-index --assume-unchanged %(file)
206 206
207# apply patch file 207# apply patch file
208bind status <C-O> ?git am %(file) 208bind status <C-O> ?git am %(file)