From: Oleg Broytman <phd@phdru.name>
Date: Thu, 27 Dec 2018 08:29:52 +0000 (+0300)
Subject: .gitconfig: Use --autostash
X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=commitdiff_plain;h=812a006437cc082befed76db46a1ed71202fe953

.gitconfig: Use --autostash
---

diff --git a/.gitconfig b/.gitconfig
index 8b2f479..969d6d7 100644
--- 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
-  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 ###
 
@@ -163,7 +163,7 @@
 	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