X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/ced2d0d4ce06f7c2a2e4bf2f0eb5b5951d8fd8b7..HEAD:/.gitconfig diff --git a/.gitconfig b/.gitconfig index 28356db..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] @@ -18,7 +17,9 @@ 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]