X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/18d9b7022affcb10b27e69342d9b2c0f867ca87e..51a9858e71143bce9a9c50aea93d7f8741e1d133:/.gitconfig?ds=inline

diff --git a/.gitconfig b/.gitconfig
index 4265532..a2e8b44 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,6 +17,8 @@
 	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"
 [clean]
 	requireForce = true
 [branch]
@@ -57,3 +59,5 @@
 	signoff = true
 [rerere]
 	enabled = true
+[rebase]
+	autosquash = true