aliases update

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 90f3987954dc64bdc030e3a04d5be1430eef6f91..13957d206e89d542f7c8cfe906193055d6308e8e 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -4,19 +4,19 @@
        signingkey = 999bbcc4
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
        signingkey = 999bbcc4
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"

+       quotePath = false

 [diff]
        renames = copies
 [alias]
        restore = checkout HEAD
        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"
 [diff]
        renames = copies
 [alias]
        restore = checkout HEAD
        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
        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"
+       lst = "!cd $GIT_PREFIX && git status | grep -E --color=never -e '^([^[:space:]]|$|[[:space:]]+[^.( ])'"

 [clean]
        requireForce = true
 [branch]
 [clean]
        requireForce = true
 [branch]


@@ -39,19 +39,32 @@
        ui = auto
 [url "ssh://git.debian.org/git/"]
        insteadOf = alioth:
        ui = auto
 [url "ssh://git.debian.org/git/"]
        insteadOf = alioth:

+[url "ssh://git@git.madduck.net/madduck/"]
+       insteadOf = madduck:

 [url "git://git.madduck.net/madduck/pub/"]
        insteadOf = madduck-anon:
 [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/
+[url "ssh://git@git.madduck.net/madduck/pub/"]
+       pushInsteadOf = madduck-anon:
+[url "ssh://git@git.madduck.net/madduck/pub/"]
+       pushInsteadOf = git://git.madduck.net/madduck/pub/
+[url "ssh://git.gern.madduck.net/srv/git/"]
+       insteadOf = pmg:
+[url "ssh://shared.gern.madduck.net/srv/gern/"]
+       insteadOf = pm:
+[url "ssh://git@git.madduck.net/gitolite-admin"]
+       insteadOf = gitolite-admin:
+[url "ssh://git@admin.madduck.net/"]
+       insteadOf = sysadmin:

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

+       assume8bitEncoding = true

 [help]
        autocorrect = 5
 [format]
        signoff = true
 [rerere]
        enabled = true
 [help]
        autocorrect = 5
 [format]
        signoff = true
 [rerere]
        enabled = true

+[rebase]
+       autosquash = true