From 15cd9f1f44bc71b9298acd96c09509722fc38a3c Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Tue, 29 Jun 2021 21:45:09 +0200
Subject: [PATCH] git: Fix autostash usage for some alias

---
 .gitconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 954c503..e4b1f94 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -64,8 +64,8 @@
     code-changes = "!git log --format=format: --name-only | egrep -v '^$' | sort | uniq -c | sort -rg | head -10"
     cc = "!git code-changes"
     fixup = "commit --fixup"
-    ri = "rebase -i --autosquash"
-    up = pull --rebase
+    ri = "rebase -i --autostash"
+    up = pull --rebase --autostash
 [branch]
     #New branch track remote
     #autosetupmerge = always