This commit is contained in:
Bruno Carlin 2019-11-25 08:47:40 +01:00
parent 2cd1651e1b
commit 1f16547f93
2 changed files with 2 additions and 0 deletions

View file

@ -19,6 +19,7 @@
br = branch br = branch
cm = checkout master cm = checkout master
cl = !git branch -d $(git branch --format '%(refname:lstrip=2)' --merged master | grep -v master) cl = !git branch -d $(git branch --format '%(refname:lstrip=2)' --merged master | grep -v master)
loga = log --oneline --decorate --graph --all
pushmerge = push -o merge_request.merge_when_pipeline_succeeds pushmerge = push -o merge_request.merge_when_pipeline_succeeds
pushmr = push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds pushmr = push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds
uncommit = reset --soft HEAD^ uncommit = reset --soft HEAD^

View file

@ -173,6 +173,7 @@ call plug#begin('~/.vim/plugged')
Plug 'scrooloose/syntastic' Plug 'scrooloose/syntastic'
Plug 'mtscout6/syntastic-local-eslint.vim' Plug 'mtscout6/syntastic-local-eslint.vim'
Plug 'kien/ctrlp.vim' Plug 'kien/ctrlp.vim'
Plug 'liuchengxu/vim-clap'
Plug 'valloric/youcompleteme' Plug 'valloric/youcompleteme'
Plug 'aklt/plantuml-syntax' Plug 'aklt/plantuml-syntax'