el/dot-emacs.el: Better fontification for Ediff.

[profile] / dot / gitconfig.in

### -*-conf-*-
### Git configuration

[core]
	filemode = true
	excludesfile = @profile@/git/gitignore
	attributesfile = @profile@/git/attributes
	whitespace = trailing-space,space-before-tab,indent-with-non-tab

[user]
	name = Mark Wooding
	email = mdw@distorted.org.uk
	signingkey = @releasekey@

[annex]
	sshcaching = false

[merge]
	summary = true
	tool = emerge

[mergetool "emerge"]
	path = emerge-hack

[diff]
	renames = copies
	renameLimit = 1024
	wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]

[diff "lisp"]
	xfuncname = "^((\\(|\\s*\\(def).*$)"

[log]
	date = rfc
	decorate = true

[rebase]
	autosquash = true

[push]
	default = matching

[format]
	headers = "Organization: Straylight/Edgeware\n"

[color]
	ui = 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"
	graph = "log --pretty=oneline --abbrev-commit --graph"
	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"

[rerere]
	enabled = yes
	autoupdate = yes

[stgit]
	autoresolved = yes
	smtpdelay = 0

[mail "alias"]
	git = git@vger.kernel.org
	mdw = mdw@distorted.org.uk

[sendemail]
	from = Mark Wooding <mdw@distorted.org.uk>
	aliasesfile = @profile@/dot/mailrc
	aliasfiletype = mailrc
	chainreplyto = no
	signedoffbycc = yes
	suppresscc = self

[gui]
	fontui = -family Sans -size 10
	fontdiff = -family Fixed -size 13

[http]
	cookiefile = @home@/.gitcookies