summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tigrc8
-rw-r--r--vimrc3
2 files changed, 7 insertions, 4 deletions
diff --git a/tigrc b/tigrc
index f77122d..453ccad 100644
--- a/tigrc
+++ b/tigrc
@@ -16,7 +16,7 @@ set line-graphics = utf-8
16set refresh-mode = after-command 16set refresh-mode = after-command
17 17
18# main view 18# main view
19bind main gG :toggle commit-title-graph 19bind main ` :toggle commit-title-graph
20bind main G move-last-line 20bind main G move-last-line
21bind main c @sh -c "git branch --points-at=%(commit) | \ 21bind main c @sh -c "git branch --points-at=%(commit) | \
22 sed -n '/^*/ {n;p}' | \ 22 sed -n '/^*/ {n;p}' | \
@@ -24,6 +24,7 @@ bind main c @sh -c "git branch --points-at=%(commit) | \
24 head -1 | \ 24 head -1 | \
25 xargs git checkout" 25 xargs git checkout"
26bind main Tn @git tag "%(prompt Enter tag name: )" %(commit) 26bind main Tn @git tag "%(prompt Enter tag name: )" %(commit)
27bind main TN !git tag "%(prompt Enter tag name: )" %(commit) -a
27bind main Td @git tag -d "%(prompt Delete tag: )" 28bind main Td @git tag -d "%(prompt Delete tag: )"
28bind main Tp ?git push --tags 29bind main Tp ?git push --tags
29bind main gdt @git tag -d %(tag) 30bind main gdt @git tag -d %(tag)
@@ -54,12 +55,15 @@ set blame-view-line-number = yes,interval=5
54# status view 55# status view
55bind status s ?git stash 56bind status s ?git stash
56bind status S @git stash save "%(prompt Enter stash name: )" 57bind status S @git stash save "%(prompt Enter stash name: )"
58bind status gs !git stash save -p "%(prompt Enter stash name: )"
57bind status p !git checkout --patch -- %(file) 59bind status p !git checkout --patch -- %(file)
58bind status D ?rm %(file) 60bind status D ?rm %(file)
59bind status a ?git commit --amend 61bind status a ?git commit --amend
60bind status c ?git commit 62bind status c @git commit -m "%(prompt Enter commit message: )"
63bind status C !git commit
61bind status j :/^[MADRU?] 64bind status j :/^[MADRU?]
62bind status k :?^[MADRU?] 65bind status k :?^[MADRU?]
66bind status Tu @git update-index --assume-unchanged "%(file)"
63 67
64# stash view 68# stash view
65bind stash D ?git stash drop %(stash) 69bind stash D ?git stash drop %(stash)
diff --git a/vimrc b/vimrc
index ec98e20..666cef1 100644
--- a/vimrc
+++ b/vimrc
@@ -10,12 +10,11 @@ set nosol
10set ss=1 10set ss=1
11set siso=999 11set siso=999
12let g:vim_markdown_conceal = 0 12let g:vim_markdown_conceal = 0
13set clipboard=unnamedplus
14 13
15nmap <c-c> :q<cr> 14nmap <c-c> :q<cr>
16nnoremap <leader>t :.w !bash<cr> 15nnoremap <leader>t :.w !bash<cr>
17nnoremap <leader>tt :TableFormat<cr> 16nnoremap <leader>tt :TableFormat<cr>
18nnoremap <leader>u :set clipboard=autoselect 17nnoremap <leader>u :set clipboard=unnamedplus<cr>
19 18
20let g:vim_markdown_folding_disabled = 1 19let g:vim_markdown_folding_disabled = 1
21 20