update

2 files changed, 3 insertions, 2 deletions

diff --git a/tigrc b/tigrc
index fcdc1e0..5356efc 100644
--- a/tigrc
+++ b/tigrc
@@ -27,6 +27,7 @@ bind main T @git tag "%(prompt Enter tag name: )" %(commit)
 bind main gdt @git tag -d %(tag)
 bind main <Ctrl-r> !?git rebase -i %(commit)
 bind main m ?git merge %(commit)
+bind main M ?git merge %(commit) --no-ff
 bind main P ?git push
 bind main b @git checkout -b "%(prompt Enter branch name: )"
 bind main B !sh scripts/bump_version.sh
diff --git a/vimrc b/vimrc
index 8d7a82a..4b99c6c 100644
--- a/vimrc
+++ b/vimrc
@@ -9,15 +9,15 @@ set nowrap
 set nosol
 set ss=1
 set siso=999
-"set clipboard=unnamedplus
 let g:vim_markdown_conceal = 0
+set clipboard=unnamedplus
 
 nmap <c-c> :q<cr>
 nnoremap <leader>t :.w !bash<cr>
 nnoremap <leader>tt :TableFormat<cr>
+nnoremap <leader>u :set clipboard=autoselect
 
 let g:vim_markdown_folding_disabled = 1
-source ~/.vim_runtime/vimrcs/redir.vim
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " =>  Redirect the output of a Vim or external command into a scratch buffer