diff options
| author | Florian Pritz <bluewind@xinu.at> | 2019-06-25 10:04:49 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2019-07-06 14:19:22 +0200 |
| commit | b34bb68ce21e673563a71377c3196d10605e4ca9 (patch) | |
| tree | e8f81f6089a5e4bc722556b37564b41db5c5355f | |
| parent | 7665ee333713d46318e1b44b0e51289e4b3da933 (diff) | |
| download | dotfiles-b34bb68ce21e673563a71377c3196d10605e4ca9.tar.gz dotfiles-b34bb68ce21e673563a71377c3196d10605e4ca9.tar.xz | |
git: Add new alias and add -v to fetch
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -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 |