do not quote utf-8 filenames

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 4265532d1500d13c3e6495c8fbe5f8060d780ad7..f2bd8778a921a9c8ffd194be543f51b7f9ad24a6 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -4,6 +4,7 @@
        signingkey = 999bbcc4
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
+       quotePath = false
 [diff]
        renames = copies
 [alias]
@@ -17,6 +18,8 @@
        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]
@@ -45,15 +48,24 @@
        insteadOf = madduck:
 [url "ssh://git.madduck.net/madduck/pub/"]
        pushInsteadOf = git://git.madduck.net/madduck/
+[url "ssh://git.gern.madduck.net/srv/git/"]
+       insteadOf = pmg:
+[url "ssh://shared.gern.madduck.net/srv/gern/"]
+       insteadOf = pm:
 [url "ssh://git.madduck.net/gitolite-admin"]
        insteadOf = gitolite-admin:
+[url "ssh://admin.madduck.net/"]
+       insteadOf = sysadmin:
 [push]
        default = matching
 [sendemail]
        confirm = auto
+       assume8bitEncoding = true
 [help]
        autocorrect = 5
 [format]
        signoff = true
 [rerere]
        enabled = true
+[rebase]
+       autosquash = true