enable rebase.autosquash

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 599938469f035d16c23ffbafe54f7f18d60018d1..0682c0200acc1553e140cbe3da22b3b62d801f36 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,20 +1,22 @@
 [user]
        name = martin f. krafft
        email = madduck@madduck.net
 [user]
        name = martin f. krafft
        email = madduck@madduck.net

-       signingkey = 330c4a75
+       signingkey = 999bbcc4

 [core]
 [core]

-       pager = "less -Fr"
+       pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"

 [diff]
        renames = copies
 [alias]
        restore = checkout HEAD
 [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\"
        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]
 [clean]
        requireForce = true
 [branch]


@@ -22,6 +24,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]


@@ -32,11 +37,25 @@
        interactive = auto
        status = auto
        ui = auto
        interactive = auto
        status = auto
        ui = auto

-[url "git+ssh://git.debian.org/git/"]
+[url "ssh://git.debian.org/git/"]

        insteadOf = alioth:
        insteadOf = alioth:

-[url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
+[url "git://git.madduck.net/madduck/pub/"]
+       insteadOf = madduck-anon:
+[url "ssh://git.madduck.net/madduck/"]

        insteadOf = madduck:
        insteadOf = madduck:

+[url "ssh://git.madduck.net/madduck/pub/"]
+       pushInsteadOf = git://git.madduck.net/madduck/
+[url "ssh://git.madduck.net/gitolite-admin"]
+       insteadOf = gitolite-admin:

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

+[help]
+       autocorrect = 5
+[format]
+       signoff = true
+[rerere]
+       enabled = true
+[rebase]
+       autosquash = true