X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/0f97eee42bc7e8c372bfd4a81f40361b2de3e7fd..dd60cc4cf43f235234174d39f0a10d6ba19f64d3:/.gitconfig?ds=sidebyside diff --git a/.gitconfig b/.gitconfig index 00ab0c7..d77298f 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,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] @@ -23,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] @@ -41,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 = git-at-home: +[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