add sysadmin git url alias

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 00ab0c7b9e2cca6edab811b57e1442aa8954fbb8..f4e94c2a2fb7f551d6dd4ea2b84ec4f0f9c9f12d 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,7 @@
 [user]
        name = martin f. krafft
        email = madduck@madduck.net
 [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]
 [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\"
        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]
 [clean]
        requireForce = true
 [branch]


@@ -23,6 +26,9 @@
        autosetuprebase = remote
 [merge]
        tool = vimdiff
        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]
 [diff]
        tool = vimdiff
 [gui]


@@ -41,11 +47,22 @@
        insteadOf = madduck:
 [url "ssh://git.madduck.net/madduck/pub/"]
        pushInsteadOf = git://git.madduck.net/madduck/
        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:
+[url "ssh://admin.madduck.net/"]
+       insteadOf = sysadmin:

 [push]
        default = matching
 [sendemail]
        confirm = auto
 [push]
        default = matching
 [sendemail]
        confirm = auto

+       assume8bitEncoding = true

 [help]
        autocorrect = 5
 [format]
        signoff = true
 [help]
        autocorrect = 5
 [format]
        signoff = true

+[rerere]
+       enabled = true
+[rebase]
+       autosquash = true