From 3ded9c6793bcc77df1ff55c4449e87e24569ef37 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sat, 3 Jul 2021 20:58:43 +0200
Subject: [PATCH] config/git: update some upstream-related aliases

---
 .config/git/config | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.config/git/config b/.config/git/config
index ac49a80..9367675 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -124,6 +124,7 @@
 	rb = rebase
 	rbi = rebase --interactive
 	rbc = rebase --continue
+	rbu = rebase @{upstream}
 	rbm = !git rebase $(git main)
 
 	sta = stash
@@ -134,21 +135,22 @@
 
 	rh = reset HEAD~
 	rs = reset --keep
-	ru = reset --keep @{upstream}
+	rsu = reset --keep @{upstream}
 	unstage = restore --staged --
 	recover = restore --worktree --staged --
 
 	format-head = !git stash && git-clang-format HEAD~ && git commit -a --amend --no-edit && git stash pop
 
+	sun = submodule update --no-fetch
 	# Update from remote
+	su = submodule update --init --recursive
+
 	f = fetch
 	fa = fetch --all
 	fs = !git fetch && git st
 	lu = !git pull upstream ${1:-$(git curbranch)}
 
 	rg = rmgonebranches
-	su = submodule update --init --recursive
-	sun = submodule update --no-fetch
 	gcr = !git gc && git repack -a -d
 
 	# Change remote