add squash and fixup aliases

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index be05efad01db3471dbac4bd4aa32457068ae848a..a2e8b44c33f2648089ddedbfe31469a5ae126d0d 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,7 @@
 [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]
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
 [diff]


@@ -16,6 +16,9 @@
        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\"
        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]


@@ -44,6 +47,8 @@
        insteadOf = madduck:
 [url "ssh://git.madduck.net/madduck/pub/"]
        pushInsteadOf = git://git.madduck.net/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]
 [push]
        default = matching
 [sendemail]


@@ -54,3 +59,5 @@
        signoff = true
 [rerere]
        enabled = true
        signoff = true
 [rerere]
        enabled = true

+[rebase]
+       autosquash = true