aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gitconfig2
-rw-r--r--tigrc6
-rw-r--r--vimrc8
3 files changed, 12 insertions, 4 deletions
diff --git a/gitconfig b/gitconfig
index 2036c46..1df5b38 100644
--- a/gitconfig
+++ b/gitconfig
@@ -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
diff --git a/tigrc b/tigrc
index 08e666b..0a0956a 100644
--- a/tigrc
+++ b/tigrc
@@ -21,6 +21,7 @@ bind main b @git checkout -b "%(prompt Enter branch name: )" %(commit)
21bind main V @git log -S "%(prompt Enter search word: )" 21bind main V @git log -S "%(prompt Enter search word: )"
22bind main gd ?git branch -d %(branch) 22bind main gd ?git branch -d %(branch)
23bind main gD ?git branch -D %(branch) 23bind main gD ?git branch -D %(branch)
24bind main C !git branch --points-at=%(commit) | echo
24 25
25set main-view = \ 26set main-view = \
26 date:default \ 27 date:default \
@@ -40,9 +41,10 @@ bind status a ?git commit --amend
40bind stash D ?git stash drop %(stash) 41bind stash D ?git stash drop %(stash)
41bind stash a ?git stash apply %(stash) 42bind stash a ?git stash apply %(stash)
42 43
43bind refs d ?git branch -d %(branch) 44bind refs C none
44bind refs <Esc>d ?git branch -D %(branch)
45bind refs c ?git checkout %(branch) 45bind refs c ?git checkout %(branch)
46bind refs d @git branch -d %(branch)
47bind refs b @git branch %(branch) %(commit)
46 48
47set ignore-case = true 49set ignore-case = true
48set line-graphics = utf-8 50set line-graphics = utf-8
diff --git a/vimrc b/vimrc
index 63282b4..5e61f42 100644
--- a/vimrc
+++ b/vimrc
@@ -10,9 +10,11 @@ set nosol
10set ss=1 10set ss=1
11set siso=999 11set siso=999
12"set clipboard=unnamedplus 12"set clipboard=unnamedplus
13let g:vim_markdown_conceal = 0
13 14
14nmap <c-c> :q<cr> 15nmap <c-c> :q<cr>
15nnoremap <leader>r :.w !bash<cr> 16nnoremap <leader>r :.w !bash<cr>
17nnoremap <leader>tt :TableFormat<cr>
16 18
17 19
18""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" 20"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -40,7 +42,11 @@ Plug 'Yggdroot/indentLine'
40Plug 'mileszs/ack.vim' 42Plug 'mileszs/ack.vim'
41Plug 'tpope/vim-surround' 43Plug 'tpope/vim-surround'
42Plug 'lifepillar/pgsql.vim' 44Plug 'lifepillar/pgsql.vim'
43Plug 'dhruvasagar/vim-table-mode' 45
46" Install vim-maktaba plugin for plugin developers - used in foldcol
47Plug '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
46call plug#end() 52call plug#end()