X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a8b58654f90e8fc3fa73fe4cd7240c5b03874947..0da936e790e3d09b665c1e1b7de9fe905b7762ee:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index 56ae58f..0682c02 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,20 +1,61 @@
 [user]
 	name = martin f. krafft
 	email = madduck@madduck.net
-	signingkey = 330c4a75
+	signingkey = 999bbcc4
 [core]
-	pager = cat
-[gui]
-	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+	pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
+[diff]
+	renames = copies
 [alias]
 	restore = checkout HEAD
-	dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | gzip -9 > ../$(git describe HEAD).tar.gz"
+	dist = "!git archive --format=tar -v --prefix=$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,')/ HEAD | gzip -9 > ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz"
+	ddist = "!git dist && mv ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz ../$(git describe HEAD | sed -e 's,-,_,;s,-,+,g').orig.tar.gz"
 	st = status
 	co = checkout
 	ci = commit -a
 	stat = status
 	files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
-	returnto = "!git add . && git commit -m'stowing away trash' >/dev/null && d=$(date +%Y.%m.%d.%H.%M.%S) && git tag trash/$d && echo tagged unwanted worktree $(git rev-parse --short HEAD) with trash/$d && git reset --hard HEAD^ >/dev/null && git reset --hard"
+	sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
+	unstage = reset HEAD
 [clean]
 	requireForce = true
-
+[branch]
+	autosetupmerge = true
+	autosetuprebase = remote
+[merge]
+	tool = vimdiff
+[merge "dpkg-mergechangelogs"]
+	name = debian/changelog merge driver
+	driver = dpkg-mergechangelogs -m %O %A %B %A
+[diff]
+	tool = vimdiff
+[gui]
+	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+[color]
+	branch = auto
+	diff = auto
+	interactive = auto
+	status = auto
+	ui = auto
+[url "ssh://git.debian.org/git/"]
+	insteadOf = alioth:
+[url "git://git.madduck.net/madduck/pub/"]
+	insteadOf = madduck-anon:
+[url "ssh://git.madduck.net/madduck/"]
+	insteadOf = madduck:
+[url "ssh://git.madduck.net/madduck/pub/"]
+	pushInsteadOf = git://git.madduck.net/madduck/
+[url "ssh://git.madduck.net/gitolite-admin"]
+	insteadOf = gitolite-admin:
+[push]
+	default = matching
+[sendemail]
+	confirm = auto
+[help]
+	autocorrect = 5
+[format]
+	signoff = true
+[rerere]
+	enabled = true
+[rebase]
+	autosquash = true