Merge pull request #61 from kir-rescomp/dev

update to merge section

Author: DininduSenanayake

docs/4.git_model_commands.md

@@ -278,6 +278,25 @@ gitGraph
 </center>
 
 
+!!! circle-info "Useful `git log` variations"
+
+    ```bash
+    # Compact one-line format
+    git log --oneline
+    
+    # Show last 5 commits
+    git log -5
+    
+    # Show changes in each commit
+    git log -p
+    
+    # Show commits by specific author
+    git log --author="Dr. X"
+    
+    # Show commits in date range
+    git log --since="2 weeks ago"
+    ```
+
 
 ### 8. `git checkout` — Switching branches
 
@@ -332,13 +351,13 @@ gitGraph
 
 Once testing is complete, Dr. X merges their branch back into main.
 
-!!! terminal ""
-    ```bash    # Switch to the branch you want to merge INTO
-    git checkout main
-    
-    # Merge the feature branch
-    git merge normalisation
-    ```
+```bash    
+# Switch to the branch you want to merge INTO
+git checkout main
+
+# Merge the feature branch
+git merge normalisation
+```
 
 
 ### 10. `git rebase` — Keeping history tidy
@@ -363,8 +382,10 @@ flowchart LR
   D -.rebase.-> C'((C'))
   style C' fill:#fffbe6,stroke:#f90
 ```
+<small>Before <code>rebase</code></small>
 </center>
 
+
 <center>
 ```mermaid
 %%{init: {'theme': 'base'}}%%
@@ -379,6 +400,7 @@ gitGraph
   checkout normalization
   merge main
 ```
+<small>After <code>rebase</code></small>
 </center>
 
 !!! warning "Golden rule of rebase"
@@ -413,38 +435,53 @@ flowchart LR
 ```
 </center>
 
-### 12. `git reset` — Undoing a mistake
+!!! circle-info "Useful `stash` commands"
 
-Oops — Dr.X accidentally committed a large **matrix.mtx** test file.
-They unstage it first:
+    ```bash
+    # List all stashes
+    git stash list
 
-```bash
-git reset matrix.mtx
-```
+    # Apply stash without removing it
+    git stash apply
 
-Then remove the bad commit:
+    # Apply a specific stash
+    git stash apply stash@{1}
 
-```bash
-git reset --soft HEAD^
-```
+    # Create a named stash
+    git stash save "WIP: adding UMAP plots"
 
-If they want to completely delete it (be careful!):
+    # Delete all stashes
+    git stash clear
+    ```
 
-```bash
-git reset --hard HEAD^
-```
+### 12. `git reset` — Undoing a mistake
 
-Reset moves the “HEAD pointer” to a previous commit — like discarding a failed experiment and reverting to known-good results.
+Oops — Dr. X accidentally committed a large **matrix.mtx** test file.
 
-<center>
-```mermaid
-%%{init: {'theme': 'base'}}%%
-gitGraph
-  commit id: "Good commit"
-  commit id: "Bad commit" tag: "HEAD"
-  %% reset --hard HEAD^ moves HEAD back one step
-```
-</center>
+There are three types of reset:
+
+!!! terminal-2 "`--soft - : Undo commit, keep changes staged"
+    **Use when:** You want to recommit with a better message or add more files.
+    ```bash
+    # Undo last commit, keep changes in staging area
+    git reset --soft HEAD^
+    ```
+
+!!! terminal-2 "`--mixed` (default): Undo commit, unstage changes"
+    
+    **Use when:** You want to redo the commit but need to modify files first.
+    ```bash
+    # Undo last commit, move changes back to working directory
+    git reset HEAD^
+    # or
+    git reset --mixed HEAD^
+    ```
+
+!!! terminal-2 "`--hard`: Undo commit, delete changes"
+    ```bash
+    # Undo last commit and DELETE all changes (be careful!)
+    git reset --hard HEAD^
+    ```
 
 
 ## Common Questions