diff options
| author | Cody Hiar <codyfh@gmail.com> | 2017-02-21 23:18:12 +0000 |
|---|---|---|
| committer | Cody Hiar <codyfh@gmail.com> | 2017-02-21 23:18:12 +0000 |
| commit | 876fc7439d5675d5fdc3f0cdcd8d90e7cf4f80af (patch) | |
| tree | b8d96e0fac79c17c361ca7d8afcf70217ea303c3 | |
| parent | 281ea368b258b4f3466219f2a3d98dbffe5c40ef (diff) | |
Adding vimdiff and git config so I can use neovim for staging changes
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | gitconfig | 23 |
2 files changed, 26 insertions, 0 deletions
@@ -27,6 +27,7 @@ RUN apk add --no-cache \ neovim \ neovim-doc \ ctags \ + vimdiff \ # Needed for python pip installs musl-dev \ gcc \ @@ -76,6 +77,8 @@ RUN ldconfig /usr/local/lib ######################################## # Add some aliases ADD bashrc /root/.bashrc +# Add my git config +ADD gitconfig /root/.gitconfig # Change the workdir, Put it inside root so I can see neovim settings in finder WORKDIR /root/app # Better terminal support diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..5f3fc39 --- /dev/null +++ b/gitconfig @@ -0,0 +1,23 @@ +[user] + name = Cody Hiar + email = codyfh@gmail.com +[color] + ui = true +[core] + editor = vim + pager = less +[alias] + lg = log --topo-order --all --graph --date=local --pretty=format:'%C(green)%h%C(reset) %><(55,trunc)%s%C(red)%d%C(reset) %C(blue)[%an]%C(reset) %C(yellow)%ad%C(reset)%n' + sw = show --pretty='format:' --name-only + st = status +[diff] + tool = vimdiff +[merge] + tool = vimdiff +[difftool] + prompt = false +[rebase] + autostash = true +[pull] + rebase = true + |