diff --git a/GIT_ASSIGNMENT.md b/GIT_ASSIGNMENT.md index ee78db6..11be46b 100644 --- a/GIT_ASSIGNMENT.md +++ b/GIT_ASSIGNMENT.md @@ -148,11 +148,24 @@ --- -## 🕵️ Step 15: Git Merge +## 🔀 Step 16: Git Merge -🔎 _Tracked who last modified each line of a file using_ `git merge filename`. +🔗 _Merged changes from one branch into another using_ `git merge branchname`. -![Git blame](merge.png) +![Git merge](merge.png) + +📌 Helps integrate changes from different branches into the main branch. + +--- + +## 🌐 Step 17: Git Log (All, Oneline Graph) + +📊 _Viewed a compact, visual history of all commits across branches using_ +`git log --oneline --graph --all`. + +![Git graph all](graphall.png) + +📌 Great for visualizing the entire project history at a glance. --- @@ -170,7 +183,8 @@ 10. ✅ **Git Remote** – Checked repository connections. 11. ✅ **Git Ignore** – Excluded unnecessary files. 12. ✅ **Git File History & Blame** – Tracked changes and contributors line by line. -13. ✅ **Git Merge** – Identifies who last modified each line in the file.. +13. ✅ **Git Merge** – Combined branch histories. +14. ✅ **Git Graph (all, oneline)** – Visualized all commits and branches. --- diff --git a/graphall.png b/graphall.png new file mode 100644 index 0000000..d70910f Binary files /dev/null and b/graphall.png differ