]> 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 squash and fixup aliases
[etc/git.git] / .gitconfig
index eafc02b1c98defd43ff54a96d8510b083c599cbd..a2e8b44c33f2648089ddedbfe31469a5ae126d0d 100644 (file)
@@ -1,20 +1,24 @@
 [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]
        renames = copies
 [alias]
        restore = checkout HEAD
 [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\"
        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
+       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]
@@ -22,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-anon:
 [url "ssh://git.madduck.net/madduck/"]
        insteadOf = madduck:
        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/
        pushInsteadOf = git://git.madduck.net/madduck/
+[url "ssh://git.madduck.net/gitolite-admin"]
+       insteadOf = gitolite-admin:
 [push]
        default = matching
 [sendemail]
 [push]
        default = matching
 [sendemail]
@@ -48,3 +57,7 @@
        autocorrect = 5
 [format]
        signoff = true
        autocorrect = 5
 [format]
        signoff = true
+[rerere]
+       enabled = true
+[rebase]
+       autosquash = true