do not start editor in edit mode

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 2ea964f961b526a6ad1e3ff47b1dba8171d8a523..a3d78687644cdd10a2df7e1500f79e1f08381221 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,7 +5,6 @@
 [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]
 [init]
        defaultBranch = main
 [diff]


@@ -15,7 +14,7 @@
        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"
        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\"
        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"
        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:]]+[^.( ])'"
        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:]]+[^.( ])'"


@@ -51,6 +50,8 @@
        insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
        insteadOf = sysadmin:
        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]