alias for unstaging files

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index eafc02b1c98defd43ff54a96d8510b083c599cbd..90f3987954dc64bdc030e3a04d5be1430eef6f91 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,20 +1,22 @@
 [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]
        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\"
+       unstage = reset HEAD
 [clean]
        requireForce = true
 [branch]
@@ -22,6 +24,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]
@@ -38,7 +43,7 @@
        insteadOf = madduck-anon:
 [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
@@ -48,3 +53,5 @@
        autocorrect = 5
 [format]
        signoff = true
+[rerere]
+       enabled = true