diff --git a/config/git/config b/config/git/config
new file mode 100644
index 0000000..7300106
--- /dev/null
+++ b/config/git/config
@@ -0,0 +1,30 @@
+[user]
+    name = zymon
+    email = s@zymon.org
+
+[core]
+    editor = nvim
+	pager = delta
+
+[init]
+    defaultBranch = main
+
+[merge]
+    conflictstyle = zdiff3
+
+[rerere]
+    enabled = true
+
+[alias]
+    st = status
+    staash = stash --all
+    cm = commit
+    df = diff
+    dfs = diff --staged
+    logg = log --graph --decorate --oneline --all
+    lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all
+    lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
+    lg = lg1
+
+[maintenance]
+	repo = /home/zymon/r/test.git