diff options
-rw-r--r-- | gitconfig | 2 | ||||
-rw-r--r-- | tigrc | 6 | ||||
-rw-r--r-- | vimrc | 8 |
3 files changed, 12 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 |
@@ -21,6 +21,7 @@ bind main b @git checkout -b "%(prompt Enter branch name: )" %(commit) | |||
21 | bind main V @git log -S "%(prompt Enter search word: )" | 21 | bind main V @git log -S "%(prompt Enter search word: )" |
22 | bind main gd ?git branch -d %(branch) | 22 | bind main gd ?git branch -d %(branch) |
23 | bind main gD ?git branch -D %(branch) | 23 | bind main gD ?git branch -D %(branch) |
24 | bind main C !git branch --points-at=%(commit) | echo | ||
24 | 25 | ||
25 | set main-view = \ | 26 | set main-view = \ |
26 | date:default \ | 27 | date:default \ |
@@ -40,9 +41,10 @@ bind status a ?git commit --amend | |||
40 | bind stash D ?git stash drop %(stash) | 41 | bind stash D ?git stash drop %(stash) |
41 | bind stash a ?git stash apply %(stash) | 42 | bind stash a ?git stash apply %(stash) |
42 | 43 | ||
43 | bind refs d ?git branch -d %(branch) | 44 | bind refs C none |
44 | bind refs <Esc>d ?git branch -D %(branch) | ||
45 | bind refs c ?git checkout %(branch) | 45 | bind refs c ?git checkout %(branch) |
46 | bind refs d @git branch -d %(branch) | ||
47 | bind refs b @git branch %(branch) %(commit) | ||
46 | 48 | ||
47 | set ignore-case = true | 49 | set ignore-case = true |
48 | set line-graphics = utf-8 | 50 | 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,11 @@ 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' | 45 | |
46 | " Install vim-maktaba plugin for plugin developers - used in foldcol | ||
47 | Plug 'google/vim-maktaba' | ||
48 | " Install foldcol - folding columns using <ctrl-v> visual mark, then :VFoldCol | ||
49 | " Plug 'paulhybryant/foldcol' | ||
44 | 50 | ||
45 | " Initialize plugin system | 51 | " Initialize plugin system |
46 | call plug#end() | 52 | call plug#end() |