From 1f16547f937c4891c49dedd14f27e1c568707537 Mon Sep 17 00:00:00 2001 From: Bruno Carlin Date: Mon, 25 Nov 2019 08:47:40 +0100 Subject: [PATCH] misc --- git/.gitconfig | 1 + vim/.vimrc | 1 + 2 files changed, 2 insertions(+) diff --git a/git/.gitconfig b/git/.gitconfig index 5ba5950..fa2b89e 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -19,6 +19,7 @@ br = branch cm = checkout 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 pushmr = push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds uncommit = reset --soft HEAD^ diff --git a/vim/.vimrc b/vim/.vimrc index add2a2b..94e067f 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -173,6 +173,7 @@ call plug#begin('~/.vim/plugged') Plug 'scrooloose/syntastic' Plug 'mtscout6/syntastic-local-eslint.vim' Plug 'kien/ctrlp.vim' + Plug 'liuchengxu/vim-clap' Plug 'valloric/youcompleteme' Plug 'aklt/plantuml-syntax'