X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ad43d821e540097cfa9a76fcd6e21b45593998c4..f4e43257fd5b724d48f6451ab6b88a00b379b606:/gitconfig

diff --git a/gitconfig b/gitconfig
index 7442bb1..687ff9e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,10 +1,105 @@
+### -*-conf-*-
+### Git configuration
+
+[core]
+	filemode = true
+	excludesfile = @gitignore@
+
 [user]
 	name = Mark Wooding
-	email = <mdw@distorted.org.uk>
+	email = mdw@distorted.org.uk
+	signingkey = @releasekey@
 
 [merge]
 	summary = true
+	tool = emerge
+
+[mergetool "emerge"]
+	path = emerge-hack
 
 [diff]
-	color = true
 	renames = copies
+
+[format]
+	headers = "Organization: Straylight/Edgeware\n"
+
+[color]
+	diff = auto
+	status = auto
+	branch = auto
+	interactive = auto
+	grep = auto
+
+[color "diff"]
+	plain = normal
+	meta = bold
+	new = green
+	old = red
+	commit = bold yellow
+	whitespace = reverse red
+
+[color "interactive"]
+        prompt = bold yellow
+        header = bold
+        help = green
+        error = bold red
+
+[color "status"]
+	header = bold
+	added = bold green
+	changed = bold blue
+	untracked = bold red
+
+[color "branch"]
+	current = bold
+	local = normal
+	remote = cyan
+
+[color "grep"]
+	external = --color=always
+
+[alias]
+	egrep = "grep -E"
+	patch = "format-patch -o p -s"
+	release = !"sh -e -c ' \
+		[ $# -gt 0 ] || { \
+		  echo >&2 \"usage: git release TAG [OPTS]\"; \
+		  exit 1; \
+		}; \
+		git tag -as -m \"Release $1.\" \"$@\"' release"
+	amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
+	spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
+		xargs -0r space -cv' spaces"
+	mailto = "send-email \
+			--quiet \
+			--no-chain-reply-to \
+			--no-signed-off-by-cc \
+			--to"
+	files = "ls-files --exclude-standard"
+	unstg = !"sh -e -c ' \
+		: ${GIT_DIR=$(git rev-parse --git-dir)}; \
+		if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \
+		for branch; do \
+		  rmdir \"$GIT_DIR/patches/$branch/patches\"; \
+		  rm -rf \"$GIT_DIR/patches/$branch\"; \
+		  git for-each-ref -s \
+		    --format \"git update-ref -d %(refname) %(objectname)\" \
+		    \"refs/patches/$branch\" \"refs/bases/$branch\" | \
+		    sh -e; \
+		done' unstg"
+
+[stgit]
+	autoresolved = yes
+	smtpdelay = 0
+
+[mail "alias"]
+	git = git@vger.kernel.org
+	mdw = mdw@distorted.org.uk
+
+[sendemail]
+	chainreplyto = no
+	signedoffcc = yes
+
+[gui]
+	fontui = -family Sans -size 10
+	fontdiff = -family MiscFixed6x13 -size 10