update md file

This commit is contained in:
2025-09-18 11:57:37 +05:30
parent abc73d0ce2
commit 1a73cb683a
8 changed files with 66 additions and 1 deletions

View File

@ -125,7 +125,71 @@
![Git ignore](gitignore_file.png) ![Git ignore](gitignore_file.png)
--- ---
## 🔀 Step 14: Performing a Merge
_I merged changes from another branch into my current branch._
![git log --merge](git_log_--_merge.txt.png)
📌 Since both branches had commits, Git created a **3-way merge commit** (not a fast-forward merge).
---
## 📜 Step 15: Inspecting Merge Commit Details
👀 _I used `git log -p -- merge.txt` to review the merge commit changes._
![git log -p -- merge.txt](git_log_-p_--_merge.txt.png)
📝 Shows added and modified lines from both branches.
---
## 🗂 Step 16: Checking Simplified Log After Merge
_To quickly see the commit history after the merge, I ran:_
![git log --oneline -- merge.txt](git_log_--oneline_--_merge.txt.png)
---
## 🌳 Step 17: Visualizing All Branches and Merge
🎨 Using the graph mode to visualize history clearly:
![git log --graph --oneline --all](git_log_--graph_--oneline_--all.png)
🌿 Shows both branches and the merge commit.
---
## Step 18: Blame Tracking Line History
🖊 With git blame, I checked who wrote each line in merge.txt.
![git blame merge.txt](git_blame_merge.txt.png)
🔑 Each line is attributed to its commit.
---
## 🎯 Step 19: Blame with Line Range
🎯 To narrow focus, I ran blame only for lines 15.
![git blame -L 1,5 merge.txt](git_blame_-L_1,5_merge.txt.png)
---
## 📧 Step 20: Blame with Email
📧 Finally, I checked the author emails using git blame -e.
![git blame -e merge.txt](git_blame_-e_merge.txt.png)
---
## 🔀 Step 21: Merging Branch `feature/mergeFile` into Main
_I merged the branch `feature/bugReport` into `feature/mergeFile` using the command:_
![git merge feature/mergeFile](git_merge.png)
---
# ✨ Summary # ✨ Summary
1.**Git Version Check** Verified installation. 1.**Git Version Check** Verified installation.
@ -139,5 +203,6 @@
9.**Git Pull** Pulled updates. 9.**Git Pull** Pulled updates.
10.**Git Remote** Checked remotes. 10.**Git Remote** Checked remotes.
11.**Git Ignore** Excluded files. 11.**Git Ignore** Excluded files.
12.**Git Merge** Performed and confirmed a 3-way merge.
13.**Git Blame** Tracked who wrote each line (with -L and -e options).
--- ---

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
git_blame_-e_merge.txt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
git_blame_merge.txt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
git_log_--_merge.txt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
git_log_-p_--_merge.txt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

BIN
git_merge.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB