]> git.madduck.net Git - etc/git.git/blobdiff - .gitconfig

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

add sysadmin git url alias
[etc/git.git] / .gitconfig
index 00ab0c7b9e2cca6edab811b57e1442aa8954fbb8..f4e94c2a2fb7f551d6dd4ea2b84ec4f0f9c9f12d 100644 (file)
@@ -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]
        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