From 3dc7a2810f7bc19e46608ab6a44aff7a989c5533 Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mmaret@prophesee.ai>
Date: Tue, 12 Jul 2022 14:22:52 +0200
Subject: [PATCH] git: add alias

---
 .gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index e4b1f94..32835b0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -64,8 +64,9 @@
     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 --autostash"
+    ri = "rebase -i --autostash --autosquash"
     up = pull --rebase --autostash
+    rebaseour = "rebase -Xours"
 [branch]
     #New branch track remote
     #autosetupmerge = always