Merge branch 'master' of github.com:typebrook/settings

3 files changed, 7 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 7e3081e..b7e127c 100644
--- a/tigrc
+++ b/tigrc
@@ -25,6 +25,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 \
@@ -44,9 +45,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 <Esc>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..75618cb 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 <c-c> :q<cr>
 nnoremap <leader>r :.w !bash<cr>
+nnoremap <leader>tt :TableFormat<cr>
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -40,7 +42,6 @@ Plug 'Yggdroot/indentLine'
 Plug 'mileszs/ack.vim'
 Plug 'tpope/vim-surround'
 Plug 'lifepillar/pgsql.vim'
-Plug 'dhruvasagar/vim-table-mode'
 
 " Initialize plugin system
 call plug#end()