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