From 801275da2d633d9668e6ced7b0b739415bc22e31 Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Tue, 16 May 2023 20:50:20 +0100
Subject: [PATCH] Update git aliases

---
 users/tsv/git/config | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/users/tsv/git/config b/users/tsv/git/config
index 72cfc3a..bc369ce 100644
--- a/users/tsv/git/config
+++ b/users/tsv/git/config
@@ -15,16 +15,17 @@
         aa = add -A
         ap = add --patch
         aap = !git add --intent-to-add . && git add --patch
+        br = branch
         co = checkout
         cm = commit
-        st = status
-        br = branch
+        cma = commit --amend
         hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
-        type = cat-file -t
-        dump = cat-file -p
         last = log -1 HEAD
-        unstage = restore --staged
+        pf = push --force
         pushup = !git push -u origin $(git symbolic-ref --short HEAD)
+        rbd = rebase develop
+        rbi = rebase -i # Useful for squashing commits
+        st = status
         tree = log --oneline --graph --decorate --all
         undo-commit = reset --soft HEAD~
 [init]