X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a58ca949d53c406211bb6f19190a3eb66ba88b40..18d9b7022affcb10b27e69342d9b2c0f867ca87e:/.gitconfig diff --git a/.gitconfig b/.gitconfig index c15fdd8..4265532 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,7 @@ [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] @@ -16,6 +16,7 @@ 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] @@ -44,6 +45,8 @@ 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] @@ -52,3 +55,5 @@ autocorrect = 5 [format] signoff = true +[rerere] + enabled = true