[user]
name = martin f. krafft
email = madduck@madduck.net
- signingkey = 330c4a75
+ signingkey = 999bbcc4
[core]
- pager = "less -Fr"
+ 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
sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
+ unstage = reset HEAD
[clean]
requireForce = true
[branch]
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]
interactive = auto
status = auto
ui = auto
-[url "git+ssh://git.debian.org/git/"]
+[url "ssh://git.debian.org/git/"]
insteadOf = alioth:
-[url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
+[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