git: clean up aliases

We remove the assume stuff since we barely use them and are quite
dangerous if we forget about them.

The old oh aliases are also now superseded by the u aliases.

.config/git/config

@@ -30,19 +30,13 @@
 	pushDefault = origin
 [alias]
 	root = !pwd
-	assume   = update-index --assume-unchanged
-	unassume = update-index --no-assume-unchanged
-	assumed  = "!git ls-files -v | grep ^h | cut -c 3-"
 	lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"
-	po = push origin
-	pof = push origin --force-with-lease
 	p = push
 	pf = push --force-with-lease
-	ff = merge --ff-only
-	roh = rebase origin/HEAD
-	rioh = rebase -i origin/HEAD
+	ff = merge --ff-only @{upstream}
 	ru = rebase @{upstream}
 	riu = rebase -i @{upstream}
+	riau = rebase -i --autosquash @{upstream}
 	ca = commit --amend
 	smash = "!git add -u && git ca --no-edit && git pof"
 	reset-head = remote set-head origin -a