3 files changed, 79 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..2cef2a2
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,66 @@
+[user]
+	name = Amin Bandali
+	email = bandali@gnu.org
+	signingkey = BE6273738E616D6D1B3A08E8A21A020248816103
+
+[commit]
+	gpgsign = true
+
+# [format]
+# 	signoff = true
+
+[core]
+	autocrlf = input  # CRLF -> LF on commit
+	editor = emacsclient -t
+	pager = "less"
+
+[mailmap]
+	file = ~/.config/git/mailmap
+
+[alias]
+	git = !exec git	 # handle nested git calls, e.g. git git status
+	aliases = config --get-regexp '^alias\\.'
+	a = add
+	s = status
+	sl = status --long
+	c = checkout
+	cb = checkout -b
+	b = branch
+	r = rebase
+	p = pull
+	pr = pull --rebase
+	ps = push
+	psf = push --force
+	nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f"
+	nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
+
+[color]
+	ui = auto
+[color "status"]
+	added = green bold
+	changed = red bold
+	untracked = red bold
+[color "branch"]
+	current = green bold
+	remote = magenta bold
+[color "diff"]
+	new = green bold
+	old = red bold
+
+# [status]
+# 	# showUntrackedFiles = all
+# 	short=true
+# 	branch=true
+
+[github]
+	user = notbandali
+
+[sendemail]
+	smtpuser = bandali
+	smtpserver = fencepost.gnu.org
+	smtpserverport = 587
+	smtpencryption = tls
+	annotate = yes
+
+[transfer]
+	fsckObjects = true
diff --git a/.config/git/ignore b/.config/git/ignore
new file mode 100644
index 0000000..1a03171
--- /dev/null
+++ b/.config/git/ignore
@@ -0,0 +1,8 @@
+*.orig
+*.py[co]
+*.sublime-workspace
+*~
+.DS_Store
+*.elc
+*-autoloads.el
+TAGS
diff --git a/.config/git/mailmap b/.config/git/mailmap
new file mode 100644
index 0000000..2c03291
--- /dev/null
+++ b/.config/git/mailmap
@@ -0,0 +1,5 @@
+<bandali@gnu.org> <mab@gnu.org>
+<bandali@gnu.org> <amin@gnu.org>
+<bandali@gnu.org> <aminb@gnu.org>
+<bandali@gnu.org> <amin@aminb.org>
+<bandali@gnu.org> <me@aminb.org>