amend and reword aliases

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f2bd8778a921a9c8ffd194be543f51b7f9ad24a6..3ca60401a4d8f7e3e08963691a780da521366b20 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,21 +5,21 @@
 [core]
        pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
        quotePath = false
+[init]
+       defaultBranch = main
 [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
+       unstage = restore --staged
        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:]]+[^.( ])'"
+  amend = "commit --amend --no-edit"
+  reword = "commit --amend --only"
 [clean]
        requireForce = true
 [branch]
@@ -32,30 +32,28 @@
        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
-[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 = pmg:
-[url "ssh://shared.gern.madduck.net/srv/gern/"]
-       insteadOf = pm:
-[url "ssh://git.madduck.net/gitolite-admin"]
+       insteadOf = madduck-pub:
+[url "ssh://git@git.madduck.net/gitolite-admin"]
        insteadOf = gitolite-admin:
-[url "ssh://admin.madduck.net/"]
+[url "ssh://git@admin.madduck.net/"]
        insteadOf = sysadmin:
+[url "ssh://git@git.int.toni.immo/"]
+       insteadOf = toni:
 [push]
        default = matching
 [sendemail]
@@ -69,3 +67,7 @@
        enabled = true
 [rebase]
        autosquash = true
+[pull]
+       rebase = merges
+[advice]
+       ignoredHook = false