diff options
-rw-r--r-- | gitconfig | 2 | ||||
-rw-r--r-- | tigrc | 6 | ||||
-rw-r--r-- | vimrc | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -4,6 +4,6 @@ | |||
4 | [alias] | 4 | [alias] |
5 | reorder = "!GIT_SEQUENCE_EDITOR=\"sed -i -n 'h;1n;2p;g;p'\" git rebase -i HEAD~2" | 5 | reorder = "!GIT_SEQUENCE_EDITOR=\"sed -i -n 'h;1n;2p;g;p'\" git rebase -i HEAD~2" |
6 | [core] | 6 | [core] |
7 | pager = tig | 7 | pager = |
8 | [color] | 8 | [color] |
9 | ui = off | 9 | ui = off |
@@ -25,6 +25,7 @@ bind main b @git checkout -b "%(prompt Enter branch name: )" %(commit) | |||
25 | bind main V @git log -S "%(prompt Enter search word: )" | 25 | bind main V @git log -S "%(prompt Enter search word: )" |
26 | bind main gd ?git branch -d %(branch) | 26 | bind main gd ?git branch -d %(branch) |
27 | bind main gD ?git branch -D %(branch) | 27 | bind main gD ?git branch -D %(branch) |
28 | bind main C !git branch --points-at=%(commit) | echo | ||
28 | 29 | ||
29 | set main-view = \ | 30 | set main-view = \ |
30 | date:default \ | 31 | date:default \ |
@@ -44,9 +45,10 @@ bind status a ?git commit --amend | |||
44 | bind stash D ?git stash drop %(stash) | 45 | bind stash D ?git stash drop %(stash) |
45 | bind stash a ?git stash apply %(stash) | 46 | bind stash a ?git stash apply %(stash) |
46 | 47 | ||
47 | bind refs d ?git branch -d %(branch) | 48 | bind refs C none |
48 | bind refs <Esc>d ?git branch -D %(branch) | ||
49 | bind refs c ?git checkout %(branch) | 49 | bind refs c ?git checkout %(branch) |
50 | bind refs d @git branch -d %(branch) | ||
51 | bind refs b @git branch %(branch) %(commit) | ||
50 | 52 | ||
51 | set ignore-case = true | 53 | set ignore-case = true |
52 | set line-graphics = utf-8 | 54 | set line-graphics = utf-8 |
@@ -10,9 +10,11 @@ set nosol | |||
10 | set ss=1 | 10 | set ss=1 |
11 | set siso=999 | 11 | set siso=999 |
12 | "set clipboard=unnamedplus | 12 | "set clipboard=unnamedplus |
13 | let g:vim_markdown_conceal = 0 | ||
13 | 14 | ||
14 | nmap <c-c> :q<cr> | 15 | nmap <c-c> :q<cr> |
15 | nnoremap <leader>r :.w !bash<cr> | 16 | nnoremap <leader>r :.w !bash<cr> |
17 | nnoremap <leader>tt :TableFormat<cr> | ||
16 | 18 | ||
17 | 19 | ||
18 | """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" | 20 | """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" |
@@ -40,7 +42,6 @@ Plug 'Yggdroot/indentLine' | |||
40 | Plug 'mileszs/ack.vim' | 42 | Plug 'mileszs/ack.vim' |
41 | Plug 'tpope/vim-surround' | 43 | Plug 'tpope/vim-surround' |
42 | Plug 'lifepillar/pgsql.vim' | 44 | Plug 'lifepillar/pgsql.vim' |
43 | Plug 'dhruvasagar/vim-table-mode' | ||
44 | 45 | ||
45 | " Initialize plugin system | 46 | " Initialize plugin system |
46 | call plug#end() | 47 | call plug#end() |