X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/00b23f016fb36644a8fd2495f073325d549d97a4..a0d7ac1318b3019819e7f2108a924319439c5a39:/.gitconfig?ds=sidebyside diff --git a/.gitconfig b/.gitconfig index 0084c35..83f80cd 100644 --- a/.gitconfig +++ b/.gitconfig @@ -11,15 +11,12 @@ 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] @@ -50,9 +47,9 @@ 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/"] +[url "ssh://git.madduck.net/madduck/pub/"] + insteadOf = madduck-pub: +[url "ssh://git.madduck.net/pm/"] insteadOf = pm: [url "ssh://git@git.madduck.net/gitolite-admin"] insteadOf = gitolite-admin: @@ -71,3 +68,5 @@ enabled = true [rebase] autosquash = true +[advice] + ignoredHook = false