]> 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:

enable rerere
[etc/git.git] / .gitconfig
index 9b5a1f33aabc3b6c9840466700af5746c9d5ac1e..be05efad01db3471dbac4bd4aa32457068ae848a 100644 (file)
@@ -8,7 +8,8 @@
        renames = copies
 [alias]
        restore = checkout HEAD
        renames = copies
 [alias]
        restore = checkout HEAD
-       dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | gzip -9 > ../$(git describe HEAD).tar.gz"
+       dist = "!git archive --format=tar -v --prefix=$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,')/ HEAD | gzip -9 > ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz"
+       ddist = "!git dist && mv ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz ../$(git describe HEAD | sed -e 's,-,_,;s,-,+,g').orig.tar.gz"
        st = status
        co = checkout
        ci = commit -a
        st = status
        co = checkout
        ci = commit -a
@@ -22,6 +23,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]
        ui = auto
 [url "ssh://git.debian.org/git/"]
        insteadOf = alioth:
        ui = auto
 [url "ssh://git.debian.org/git/"]
        insteadOf = alioth:
+[url "git://git.madduck.net/madduck/pub/"]
+       insteadOf = madduck-anon:
 [url "ssh://git.madduck.net/madduck/"]
        insteadOf = madduck:
 [url "ssh://git.madduck.net/madduck/"]
        insteadOf = madduck:
-       pushInsteadOf = madduck:
+[url "ssh://git.madduck.net/madduck/pub/"]
        pushInsteadOf = git://git.madduck.net/madduck/
 [push]
        default = matching
        pushInsteadOf = git://git.madduck.net/madduck/
 [push]
        default = matching
@@ -46,3 +52,5 @@
        autocorrect = 5
 [format]
        signoff = true
        autocorrect = 5
 [format]
        signoff = true
+[rerere]
+       enabled = true