Update Git cheatsheet note

Author: mcecode

src/content/notes/cheatsheet-git.md

@@ -1,7 +1,7 @@
 ---
 title: "Cheatsheet: Git"
 dateCreated: 2024-11-12
-dateUpdated: 2024-11-12
+dateUpdated: 2025-08-25
 ---
 
 This cheatsheet assumes that you're already familiar with Git concepts and know the usual `init`, `pull`, `add`, `commit`, `push` flow. It aims to document commands and flags that I tend to use but forget when I haven't used them in a while.
@@ -100,6 +100,12 @@ git stash -m <message>
 git stash list
 ```
 
+### Show changes in stash
+
+```console
+git stash show [<index>]
+```
+
 ### Apply stash to current working tree
 
 ```console
@@ -234,6 +240,24 @@ Or to discard the changes you've done so far and exit the interactive rebase:
 git rebase --abort
 ```
 
+## Rebasing
+
+### Fix rebase conflicts
+
+When conflicts occur from a `git rebase` or a `git pull --rebase`. Fix the files with conflicts, stage them, then run:
+
+```console
+git rebase --continue
+```
+
+## Pushing
+
+### Push to a remote branch with a different name
+
+```console
+git push [<repository>] <local-branch>:<remote-branch>
+```
+
 ## References
 
 - <https://git-scm.com/docs>