X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/d9f61d94877fc1e37283f4477598b0bda8e66d0f..3ee48d42342a85402ab1c3f72601bce544409864:/.gitconfig?ds=sidebyside diff --git a/.gitconfig b/.gitconfig index f4e94c2..40bfaca 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,21 +4,19 @@ 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" - 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" + lst = "!cd $GIT_PREFIX && git status | grep -E --color=never -e '^([^[:space:]]|$|[[:space:]]+[^.( ])'" [clean] requireForce = true [branch] @@ -41,17 +39,23 @@ 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 "ssh://git.madduck.net/madduck/"] - insteadOf = 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.madduck.net/madduck/pub/"] - pushInsteadOf = git://git.madduck.net/madduck/ -[url "ssh://git.gern.madduck.net/srv/git"] + insteadOf = 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.madduck.net/gitolite-admin"] +[url "ssh://git@git.madduck.net/gitolite-admin"] insteadOf = gitolite-admin: -[url "ssh://admin.madduck.net/"] +[url "ssh://git@admin.madduck.net/"] insteadOf = sysadmin: [push] default = matching