aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile3
-rw-r--r--gitconfig23
2 files changed, 26 insertions, 0 deletions
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
+