From e6a2618400edcddc2a80ef2776871ca01992be03 Mon Sep 17 00:00:00 2001
From: Matt Singleton <matt@xcolour.net>
Date: Sat, 6 Feb 2021 13:39:13 -0600
Subject: big refactor to use XDG base dir spec

---
 config/git/config | 38 ++++++++++++++++++++++++++++++++++++++
 config/git/ignore | 11 +++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 config/git/config
 create mode 100644 config/git/ignore

(limited to 'config/git')

diff --git a/config/git/config b/config/git/config
new file mode 100644
index 0000000..f68fed8
--- /dev/null
+++ b/config/git/config
@@ -0,0 +1,38 @@
+[user]
+    name = Matt Singleton
+    email = matt@xcolour.net
+
+[alias]
+    st = status
+    ci = commit
+    br = branch
+    co = checkout
+    df = diff
+    lg = log -p
+
+[core]
+    whitespace = trailing-space,space-before-tab,cr-at-eol
+    editor = vim
+    autocrlf = input
+    excludesfile = /Users/matt/.gitignore
+    pager = less -+$LESS -RSX
+
+[push]
+    default = nothing
+
+[color]
+    ui = true
+
+[mergetool]
+    keepTemporaries = false
+    prompt = false
+
+[merge]
+    tool = meld
+
+[diff]
+    tool = meld
+[init]
+	defaultBranch = main
+[pull]
+	ff = only
diff --git a/config/git/ignore b/config/git/ignore
new file mode 100644
index 0000000..57dd8e6
--- /dev/null
+++ b/config/git/ignore
@@ -0,0 +1,11 @@
+*.class
+*.pyc
+*.swo
+*.swp
+.svn
+.swo
+*#*
+#
+.#*
+doc/tags
+.DS_STORE
-- 
cgit v1.2.3