From 583648b5a3e737cd08473b9d8b6b08280582a666 Mon Sep 17 00:00:00 2001
From: Jake Boeckerman <jakebman@gmail.com>
Date: Mon, 6 Nov 2023 10:42:19 -0700
Subject: [PATCH] realize I want autostash to also rebase

---
 aliases/available/jake-aliases.aliases.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aliases/available/jake-aliases.aliases.bash b/aliases/available/jake-aliases.aliases.bash
index 5ea495a027..26004ced5b 100644
--- a/aliases/available/jake-aliases.aliases.bash
+++ b/aliases/available/jake-aliases.aliases.bash
@@ -229,7 +229,7 @@ alias co='git checkout'
 alias ignored='git status --ignored'
 alias staged='git diff --staged'
 alias addp='git add --patch'
-alias autostash='git pull --autostash'
+alias autostash='git pull --rebase --autostash' # I ususally mean rebase as well as autostash
 
 # shorthand command
 alias s=status-or-show