X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a4365937711b8e88c655fa8ed65dd966305de985..HEAD:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index dded6a9..3ca6040 100644
--- 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
-	editor = sensible-editor +start
 [init]
 	defaultBranch = main
 [diff]
@@ -15,10 +14,12 @@
 	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:]]+[^.( ])'"
+  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]