diff options
| -rw-r--r-- | .gitconfig | 3 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | .vim/bundle/vim-eyaml | 0 |
3 files changed, 5 insertions, 1 deletions
@@ -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 +Subproject 876a6873c03ba904601987e86959acbb8e0dd43 |