From 876fc7439d5675d5fdc3f0cdcd8d90e7cf4f80af Mon Sep 17 00:00:00 2001
From: Cody Hiar <codyfh@gmail.com>
Date: Tue, 21 Feb 2017 23:18:12 +0000
Subject: Adding vimdiff and git config so I can use neovim for staging changes

---
 Dockerfile |  3 +++
 gitconfig  | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 gitconfig

diff --git a/Dockerfile b/Dockerfile
index d517454..982f446 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
+
-- 
cgit v1.2.3