diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..9e4fe1a
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,43 @@
+[include]
+  # local and/or misc changes not committed to Git:
+  path = .gitconfig.local
+[alias]
+  adp = add -p
+  br = branch
+  ci = commit
+  co = checkout
+  cp = cherry-pick
+  d = diff
+  ds = diff --staged
+  f = fetch
+  fixup = rebase -i --autosquash
+  nuke = reset --hard
+  rc = rebase --continue
+  shp = show -p
+  st = status
+  undo = reset --soft HEAD^
+  bn = rev-parse --abbrev-ref HEAD
+  chp = checkout -p
+  pl = pull
+  pr = diff origin/master
+  prs = diff --stat origin/master
+  rr = !git reset --hard $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
+[user]
+  email = rob@netflux.io
+  name = Rob Watson
+[core]
+  editor = vim
+[credential "https://github.com"]
+  helper = !gh auth git-credential
+[diff]
+  tool = vimdiff
+[merge]
+  tool = vimdiff
+[core]
+  pager = delta
+[interactive]
+  diffFilter = delta --color-only
+[delta]
+  side-by-side = true
+[color]
+  ui = auto
diff --git a/gitignore b/gitignore
new file mode 100644
index 0000000..07930c4
--- /dev/null
+++ b/gitignore
@@ -0,0 +1,4 @@
+# $HOME/.config/git/ignore
+
+# Ignore all .tool-versions files, unless added explicitly:
+.tool-versions