From ec84245acf295f36d8300519a5961c5fd60eea26 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 10 May 2019 19:09:15 -0400
Subject: git: move global config and ignore to $XDG_CONFIG_HOME/git

---
 .config/git/config | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 .config/git/ignore |  7 ++++++
 .gitconfig         | 64 ------------------------------------------------------
 .gitignore_global  |  7 ------
 4 files changed, 70 insertions(+), 71 deletions(-)
 create mode 100644 .config/git/config
 create mode 100644 .config/git/ignore
 delete mode 100644 .gitconfig
 delete mode 100644 .gitignore_global

diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..35f1eb9
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,63 @@
+[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"
+
+[gpg]
+	program = gpg2
+
+[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 = aminb
+
+[sendemail]
+	smtpuser = bandali
+	smtpserver = fencepost.gnu.org
+	smtpserverport = 587
+	smtpencryption = tls
+	annotate = yes
diff --git a/.config/git/ignore b/.config/git/ignore
new file mode 100644
index 0000000..e686538
--- /dev/null
+++ b/.config/git/ignore
@@ -0,0 +1,7 @@
+*.orig
+*.py[co]
+*.sublime-workspace
+*~
+.DS_Store
+*.elc
+*-autoloads.el
diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index d83d9c9..0000000
--- a/.gitconfig
+++ /dev/null
@@ -1,64 +0,0 @@
-[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
-	excludesfile = ~/.gitignore_global
-	pager = "less"
-
-[gpg]
-	program = gpg2
-
-[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 = aminb
-
-[sendemail]
-	smtpuser = bandali
-	smtpserver = fencepost.gnu.org
-	smtpserverport = 587
-	smtpencryption = tls
-	annotate = yes
diff --git a/.gitignore_global b/.gitignore_global
deleted file mode 100644
index e686538..0000000
--- a/.gitignore_global
+++ /dev/null
@@ -1,7 +0,0 @@
-*.orig
-*.py[co]
-*.sublime-workspace
-*~
-.DS_Store
-*.elc
-*-autoloads.el
-- 
cgit v1.2.3-60-g2f50