X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a58ca949d53c406211bb6f19190a3eb66ba88b40..00b23f016fb36644a8fd2495f073325d549d97a4:/.gitconfig diff --git a/.gitconfig b/.gitconfig index c15fdd8..0084c35 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,9 +1,10 @@ [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" + quotePath = false [diff] renames = copies [alias] @@ -16,6 +17,9 @@ 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] @@ -38,17 +42,32 @@ ui = auto [url "ssh://git.debian.org/git/"] insteadOf = alioth: +[url "ssh://git@git.madduck.net/madduck/"] + insteadOf = madduck: [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@git.madduck.net/madduck/pub/"] + pushInsteadOf = madduck-anon: +[url "ssh://git@git.madduck.net/madduck/pub/"] + pushInsteadOf = git://git.madduck.net/madduck/pub/ +[url "ssh://git.gern.madduck.net/srv/git/"] + insteadOf = pmg: +[url "ssh://shared.gern.madduck.net/srv/gern/"] + insteadOf = pm: +[url "ssh://git@git.madduck.net/gitolite-admin"] + insteadOf = gitolite-admin: +[url "ssh://git@admin.madduck.net/"] + insteadOf = sysadmin: [push] default = matching [sendemail] confirm = auto + assume8bitEncoding = true [help] autocorrect = 5 [format] signoff = true +[rerere] + enabled = true +[rebase] + autosquash = true