add mergechangelogs driver

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index b6129108a8e02b0f86622eec076c1de365d4a204..c15fdd819291afad22c230a58f184e3b12136c22 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,17 +3,19 @@
        email = madduck@madduck.net
        signingkey = 330c4a75
 [core]
-       pager = "less -F"
+       pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
 [diff]
        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
        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\"
 [clean]
        requireForce = true
 [branch]
@@ -21,5 +23,32 @@
        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]
        fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+[color]
+       branch = auto
+       diff = auto
+       interactive = auto
+       status = auto
+       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/pub/"]
+       pushInsteadOf = git://git.madduck.net/madduck/
+[push]
+       default = matching
+[sendemail]
+       confirm = auto
+[help]
+       autocorrect = 5
+[format]
+       signoff = true