rob
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update vimrc and gitconfig

This commit is contained in:
Rob Watson 2021-05-21 21:52:42 +02:00
parent ae2f2f55a5
commit cc99b3cecc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gitconfig
View File

@ -27,6 +27,7 @@
l = log l = log
ls = !git branch --format '%(refname:short)' | fzf ls = !git branch --format '%(refname:short)' | fzf
mr = !git merge $(git rb) mr = !git merge $(git rb)
mt = merge -s recursive -X theirs
nb = checkout -b nb = checkout -b
nuke = reset --hard nuke = reset --hard
p = push p = push

5
vimrc
View File

@ -28,7 +28,6 @@ set splitbelow
set splitright set splitright
set encoding=utf-8 set encoding=utf-8
set hidden set hidden
set history=1000
set nowrap set nowrap
set smartindent set smartindent
set copyindent set copyindent
@ -61,11 +60,11 @@ set ballooneval
set balloonevalterm set balloonevalterm
set scrolloff=15 set scrolloff=15
set dictionary=/usr/share/dict/words set dictionary=/usr/share/dict/words
" See :help thesaurus
set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
set shortmess+=I set shortmess+=I
set updatetime=250 set updatetime=250
set pastetoggle=<f2> set pastetoggle=<f2>
" See :help thesaurus
set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
set pumheight=200 set pumheight=200
set completeopt=menu,menuone,popup,noselect set completeopt=menu,menuone,popup,noselect
set completepopup=width:300,height:50,align:item,border:off set completepopup=width:300,height:50,align:item,border:off