From e292eb508413b9174684a8e75c93474a7f5351ee Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 23 Aug 2021 23:07:31 -0500
Subject: Initial

---
 git/attributes |  3 ++
 git/config     | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 git/ignore     |  3 ++
 3 files changed, 96 insertions(+)
 create mode 100644 git/attributes
 create mode 100644 git/config
 create mode 100644 git/ignore

(limited to 'git')

diff --git a/git/attributes b/git/attributes
new file mode 100644
index 0000000..a5516e5
--- /dev/null
+++ b/git/attributes
@@ -0,0 +1,3 @@
+*.lisp diff=lisp
+*.el diff=lisp
+*.org diff=org
diff --git a/git/config b/git/config
new file mode 100644
index 0000000..cad9e12
--- /dev/null
+++ b/git/config
@@ -0,0 +1,90 @@
+[user]
+	email = acdw@acdw.net
+	name = Case Duckworth
+
+[init]
+	defaultBranch = main
+
+[push]
+	default = simple
+
+[pull]
+	rebase = false	
+
+[core]
+	editor = vim
+	precomposeunicode = true
+	pager = less
+	autocrlf = false
+	eol = lf
+
+[merge]
+	conflictstyle = diff3
+	tool = vimdiff
+
+[alias]
+	# Easier locations
+	root = rev-parse --show-toplevel
+	current-branch = rev-parse --abbrev-ref HEAD
+	# Easier listing and info
+	branches = branch -a
+	tags = tag -l
+	stashes = stash list
+	remotes = remote -v
+	staged = diff --cached
+	graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset: %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order
+	precommit = diff --cached --diff-algorithm=minimal -w
+	# Easier actions
+	discard = checkout --
+	uncommit = reset --soft HEAD^
+	unstage = reset HEAD --
+	amend = commit --amend
+	pushall = !git remote | xargs -L1 git push --all
+	# Shortened commonalities
+	st = status -bs
+	ac = !git add . && git commit -m
+
+# diffing	
+[diff "lisp"]
+	xfuncname = "^(\\(.*)$"
+[diff "org"]
+	xfuncname = "^(\\*+.*)$"	
+
+; [credential]
+;	helper = /home/case/.local/bin/pass-git-helper
+;	useHttpPath = true
+
+[bash]
+	showUntrackedFiles = true
+	showDirtyState = true
+
+[sendemail]
+	smtpserver = smtp.fastmail.com
+	smtpuser = acdw@fastmail.com
+	smtpencryption = tls
+	smtpserverport = 465
+	
+# Better urls
+[url "https://github.com/"]
+	insteadOf = "gh:"
+[url "git@github.com:"]
+	pushInsteadOf = "gh:"
+[github]
+	user = duckwork
+	
+[url "https://gitlab.com/"]
+	insteadOf = "gl:"
+[url "git@gitlab.com:"]
+	pushInsteadOf = "gl:"
+[gitlab]
+	user = acdw
+
+[url "https://git.sr.ht/"]
+	insteadOf = "sr:"
+[url "git@git.sr.ht:"]
+	pushInsteadOf = "sr:"
+
+[url "https://tildegit.org/"]
+	insteadOf = "tg:"
+[url "git@tildegit.org:"]
+	pushInsteadOf = "tg:"	
diff --git a/git/ignore b/git/ignore
new file mode 100644
index 0000000..6a4c747
--- /dev/null
+++ b/git/ignore
@@ -0,0 +1,3 @@
+*.sw?
+*~
+.DS\_Store
-- 
cgit 1.4.1-21-gabe81