tidy up global git config & see what ignore patterns we really need

2 files changed, 150 insertions, 0 deletions

diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 00000000..b6720a7d
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,120 @@
+# -*- mode: conf -*-
+
+[alias]
+	s = status
+	co = checkout
+	sco = "!f() { git stash && git checkout \"$@\"; git stash pop; }; f"
+	v  = log --graph --full-history -30 --decorate --oneline --all
+	ov = log --graph --full-history -30 --decorate --oneline --all \
+		--simplify-by-decoration
+
+[annex]
+	# Manually upgrade to new repository layouts once I've confirmed that
+	# doing so doesn't break any scripts.
+	autoupgraderepository = false
+
+	# Configure git-annex such that just running 'git annex init' doesn't
+	# change what 'git add' does.
+	gitaddtoannex = false
+	skipunknown = true
+
+[color]
+	# So that we get colour in Eshell.  When we can assume git 2.31 might
+	# want to have GIT_CONFIG_KEY_1=color.ui and GIT_CONFIG_VALUE_1=always
+	# in ~/.emacs.d/eshell/profile instead.
+	ui = always
+
+[core]
+	pager =
+
+[dgit "default"]
+	clean-mode = git-ff
+	rm-old-changes = true
+	distro = debian
+
+[dgit-distro "debian"]
+	keyid = 8DC2487E51ABDD90B5C4753F0F56D0553B6D411B
+	# If and when #691703 is resolved, switch to 'ssh-upload'.
+	# There is also 'ftp-eu' in the meantime.
+	upload-host = ftp-master
+
+[format]
+	# There's no tilde expansion for this.	When can assume git 2.31 can
+	# set GIT_CONFIG_KEY_0=format.outputDirectory &
+	# GIT_CONFIG_VALUE_0="$HOME/tmp" in ~/.profile instead.
+	outputDirectory = /home/spwhitton/tmp
+
+# These defaults turn off anonymous recipients to minimise key usage prompts.
+[gcrypt]
+	publish-participants = true
+	participants = 0F56D0553B6D411B
+	signingkey = 0F56D0553B6D411B
+
+[merge "dpkg-mergechangelogs"]
+	   name = debian/changelog merge driver
+	   driver = dpkg-mergechangelogs -m %O %A %B %A
+
+[tar "tar.xz"]
+	command = xz -c
+[tar "tar.gz"]
+	command = gzip -c
+
+[transfer]
+	fsckObjects = true
+
+[pull]
+	rebase = true
+
+[push]
+	default = upstream
+
+[rebase]
+	autoStash = true
+
+[sendemail]
+	annotate = true
+	confirm = always
+	from = Sean Whitton <spwhitton@spwhitton.name>
+
+[user]
+	name = Sean Whitton
+	email = spwhitton@spwhitton.name
+
+[url "https://git.spwhitton.name/"]
+	 insteadOf = demeter:
+	 insteadOf = git://git.spwhitton.name/
+	 insteadOf = http://git.spwhitton.name/
+	 insteadOf = athena:		     # for compatibility only
+	 insteadOf = git://spwhitton.name/   # for compatibility only
+[url "git@git.spwhitton.name:"]
+	 pushInsteadOf = http://git.spwhitton.name/
+	 pushInsteadOf = https://git.spwhitton.name/
+	 pushInsteadOf = git://git.spwhitton.name/
+	 pushInsteadOf = demeter:
+	 pushInsteadOf = athena:	       # for compatibility only
+	 pushInsteadOf = git://spwhitton.name/ # for compatibility only
+
+[url "https://github.com/"]
+	insteadOf = github:
+	insteadOf = git://github.com/
+	insteadOf = http://github.com/
+[url "git@github.com:"]
+	pushInsteadOf = github:
+	pushInsteadOf = git://github.com/
+	pushInsteadOf = http://github.com/
+	pushInsteadOf = https://github.com/
+
+[url "https://salsa.debian.org/"]
+	 insteadOf = salsa:
+	 insteadOf = http://salsa.debian.org/
+[url "git@salsa.debian.org:"]
+	 pushInsteadOf = salsa:
+	 pushInsteadOf = http://salsa.debian.org/
+	 pushInsteadOf = https://salsa.debian.org/
+
+[url "spwhitton@git.savannah.gnu.org:/srv/git/"]
+	 pushInsteadOf = https://git.savannah.gnu.org/git/
+
+# Mostly local overrides, e.g. of user.name and user.email.
+[include]
+	path = ~/.config/git/local
diff --git a/.config/git/ignore b/.config/git/ignore
new file mode 100644
index 00000000..dea63bbd
--- /dev/null
+++ b/.config/git/ignore
@@ -0,0 +1,30 @@
+\#*#
+.#*
+*~
+*.~lock*
+
+TAGS
+GTAGS
+GRTAGS
+GPATH
+dist/
+feh_*_filelist
+
+*.aux
+*.nav
+*.log
+*.dvi
+*.toc
+*.fmt
+*.bbl
+*.blg
+*.url
+*.fasl
+*.rej
+
+.pc/
+.debhelper/
+/debian/debhelper-build-stamp
+/debian/files
+*.debhelper
+*.substvars