cleanup gui config

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 0084c351fb015a45b7dcc3046d5fe888dbb43130..1978b30024be644336db58a9f141f4ee4e879598 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,21 +5,20 @@
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
        quotePath = false
 [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]


@@ -32,8 +31,6 @@
        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
 [color]
        branch = auto
        diff = auto


@@ -50,10 +47,8 @@
        pushInsteadOf = madduck-anon:
 [url "ssh://git@git.madduck.net/madduck/pub/"]
        pushInsteadOf = 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.madduck.net/madduck/pub/"]
+       insteadOf = madduck-pub:

 [url "ssh://git@git.madduck.net/gitolite-admin"]
        insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
 [url "ssh://git@git.madduck.net/gitolite-admin"]
        insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]


@@ -71,3 +66,7 @@
        enabled = true
 [rebase]
        autosquash = true
        enabled = true
 [rebase]
        autosquash = true

+[pull]
+       rebase = merges
+[advice]
+       ignoredHook = false