]> git.madduck.net Git - etc/git.git/blobdiff - .gitconfig

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

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

add toni
[etc/git.git] / .gitconfig
index 7f21439605c0cf1889e9c8ab9c60ff8fe5dc191b..dded6a955a69fdc68b1fe1a2c878a233e1834d2c 100644 (file)
@@ -4,21 +4,21 @@
        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
+       editor = sensible-editor +start
+[init]
+       defaultBranch = main
 [diff]
        renames = copies
 [alias]
 [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"
        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"
        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]
        driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
        tool = vimdiff
        driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
        tool = vimdiff
-[gui]
-       fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
        branch = auto
        diff = auto
        interactive = auto
        status = auto
        ui = auto
 [color]
        branch = auto
        diff = auto
        interactive = auto
        status = auto
        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@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/"]
 [url "ssh://git.madduck.net/madduck/pub/"]
-       pushInsteadOf = git://git.madduck.net/madduck/
-[url "ssh://git.gern.madduck.net/srv/git"]
-       insteadOf = pm:
-[url "ssh://git.madduck.net/gitolite-admin"]
+       insteadOf = madduck-pub:
+[url "ssh://git@git.madduck.net/gitolite-admin"]
        insteadOf = gitolite-admin:
        insteadOf = gitolite-admin:
+[url "ssh://git@admin.madduck.net/"]
+       insteadOf = sysadmin:
+[url "ssh://git@git.int.toni.immo/"]
+       insteadOf = toni:
 [push]
        default = matching
 [sendemail]
 [push]
        default = matching
 [sendemail]
@@ -64,3 +66,7 @@
        enabled = true
 [rebase]
        autosquash = true
        enabled = true
 [rebase]
        autosquash = true
+[pull]
+       rebase = merges
+[advice]
+       ignoredHook = false