add squash and fixup aliases

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 4265532d1500d13c3e6495c8fbe5f8060d780ad7..a2e8b44c33f2648089ddedbfe31469a5ae126d0d 100644 (file)
--- 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
        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]
 [clean]
        requireForce = true
 [branch]


@@ -57,3 +59,5 @@
        signoff = true
 [rerere]
        enabled = true
        signoff = true
 [rerere]
        enabled = true

+[rebase]
+       autosquash = true