From 878acfab476ea180acd3a57791ecaad56b7303b2 Mon Sep 17 00:00:00 2001 From: typebrook Date: Tue, 5 Mar 2019 08:38:33 +0800 Subject: update --- gitconfig | 2 +- tigrc | 6 ++++-- vimrc | 8 +++++++- 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 @@ [alias] reorder = "!GIT_SEQUENCE_EDITOR=\"sed -i -n 'h;1n;2p;g;p'\" git rebase -i HEAD~2" [core] - pager = tig + pager = [color] 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) bind main V @git log -S "%(prompt Enter search word: )" bind main gd ?git branch -d %(branch) bind main gD ?git branch -D %(branch) +bind main C !git branch --points-at=%(commit) | echo set main-view = \ date:default \ @@ -40,9 +41,10 @@ bind status a ?git commit --amend bind stash D ?git stash drop %(stash) bind stash a ?git stash apply %(stash) -bind refs d ?git branch -d %(branch) -bind refs d ?git branch -D %(branch) +bind refs C none bind refs c ?git checkout %(branch) +bind refs d @git branch -d %(branch) +bind refs b @git branch %(branch) %(commit) set ignore-case = true set line-graphics = utf-8 diff --git a/vimrc b/vimrc index 63282b4..5e61f42 100644 --- a/vimrc +++ b/vimrc @@ -10,9 +10,11 @@ set nosol set ss=1 set siso=999 "set clipboard=unnamedplus +let g:vim_markdown_conceal = 0 nmap :q nnoremap r :.w !bash +nnoremap tt :TableFormat """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -40,7 +42,11 @@ Plug 'Yggdroot/indentLine' Plug 'mileszs/ack.vim' Plug 'tpope/vim-surround' Plug 'lifepillar/pgsql.vim' -Plug 'dhruvasagar/vim-table-mode' + +" Install vim-maktaba plugin for plugin developers - used in foldcol +Plug 'google/vim-maktaba' +" Install foldcol - folding columns using visual mark, then :VFoldCol +" Plug 'paulhybryant/foldcol' " Initialize plugin system call plug#end() -- cgit v1.2.3-70-g09d2