.gitconfig: Use --autostash

diff --git a/.gitconfig b/.gitconfig
index 8b2f47915e05fc1843e6e248ded629be72f48c41..969d6d788343d6cb110a8855cc936e6e881f565b 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -68,7 +68,7 @@
 
   # See https://blog.filippo.io/git-fixup-amending-an-older-commit/
   # This is a slightly modified version
 
   # See https://blog.filippo.io/git-fixup-amending-an-older-commit/
   # This is a slightly modified version

-  fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autosquash $TARGET~; }; f"
+  fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autostash --autosquash $TARGET~; }; f"

 
   ### remote ###
 
 
   ### remote ###
 


@@ -163,7 +163,7 @@
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
        null-merge = merge --strategy=ours
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
        null-merge = merge --strategy=ours

-       rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+       rbi123 = "!f() { exec git rebase --interactive --autostash $1 $2 ${3:-\"@{upstream\\}\"}; }; f"

        rbi = !exec git rbi123 '' ''
        rbia = !exec git rbi123 --autosquash ''
        rbiap = !exec git rbi123 --autosquash --preserve-merges
        rbi = !exec git rbi123 '' ''
        rbia = !exec git rbi123 --autosquash ''
        rbiap = !exec git rbi123 --autosquash --preserve-merges