X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/f3b2adb1d3afd1d591247c3204bb191cf716c8f7..debcaf62c768630daf373b5385f9be5dddb582b2:/.gitconfig diff --git a/.gitconfig b/.gitconfig index 503f01d..7f21439 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,20 +1,24 @@ [user] name = martin f. krafft email = madduck@madduck.net - signingkey = 330c4a75 + signingkey = 999bbcc4 [core] 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 + sq = "!merge_squash_commit() { git merge --squash \"$1\" && git commit -m \"$1 squash\"; }; merge_squash_commit" + fixup = "!fixup_commit() { local c=\"$1\"; shift; git commit --fixup=\"$c\" \"$@\"; }; fixup_commit" [clean] requireForce = true [branch] @@ -22,6 +26,9 @@ 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] @@ -40,11 +47,20 @@ insteadOf = madduck: [url "ssh://git.madduck.net/madduck/pub/"] pushInsteadOf = git://git.madduck.net/madduck/ +[url "ssh://git.gern.madduck.net/srv/git"] + insteadOf = pm: +[url "ssh://git.madduck.net/gitolite-admin"] + insteadOf = gitolite-admin: [push] default = matching [sendemail] confirm = auto + assume8bitEncoding = true [help] autocorrect = 5 [format] signoff = true +[rerere] + enabled = true +[rebase] + autosquash = true