From b34bb68ce21e673563a71377c3196d10605e4ca9 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Tue, 25 Jun 2019 10:04:49 +0200 Subject: git: Add new alias and add -v to fetch Signed-off-by: Florian Pritz --- .gitconfig | 3 ++- .gitmodules | 3 +++ .vim/bundle/vim-eyaml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 .vim/bundle/vim-eyaml diff --git a/.gitconfig b/.gitconfig index 44c7b16..5a3c632 100644 --- a/.gitconfig +++ b/.gitconfig @@ -26,8 +26,9 @@ ri = rebase -i --autosquash fix = commit --fixup list-branches = branch --sort=committerdate --format='%(HEAD) %(color:red)%(objectname:short)%(color:reset) %(align:30)%(color:yellow)%(refname:short)%(color:reset)%(end) %(align:30)(%(color:green)%(committerdate:relative)%(color:reset))%(end) %(align:20)%(authorname)%(end) %(contents:subject)' - f = fetch -p + f = fetch -pv fa = fetch -p --all + up = pull --rebase [merge] tool = kdiff3 conflictstyle = diff3 diff --git a/.gitmodules b/.gitmodules index 5199333..0d12e31 100644 --- a/.gitmodules +++ b/.gitmodules @@ -142,3 +142,6 @@ [submodule ".vim/bundle/vim-puppet"] path = .vim/bundle/vim-puppet url = https://github.com/rodjek/vim-puppet.git +[submodule ".vim/bundle/vim-eyaml"] + path = .vim/bundle/vim-eyaml + url = https://github.com/davewongillies/vim-eyaml.git diff --git a/.vim/bundle/vim-eyaml b/.vim/bundle/vim-eyaml new file mode 160000 index 0000000..876a687 --- /dev/null +++ b/.vim/bundle/vim-eyaml @@ -0,0 +1 @@ +Subproject commit 876a6873c03ba904601987e86959acbb8e0dd43d -- cgit v1.2.3-24-g4f1b