Git-Training-Hub/git-practice-ash
22
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ASSIGNMENT-04-09-2025.md

Browse Source
This commit is contained in:
ashish.livingston
2025-09-11 05:26:35 +00:00
parent 57ee6e797c
commit b18c3dc2fe
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ASSIGNMENT-04-09-2025.md
View File

@ -0,0 +1,28 @@
Part 1: Viewing File History
![Screenshot](11g.png)
![Screenshot](22g.png)
![Screenshot](33g.png)
![Screenshot](44g.png)
Number of commits modifying example.txt: 3
Difference with -p: Shows the patch/diff along with commit metadata.
Part 2: Viewing File History with Blame
![Screenshot](b1.png)
git blame → shows commit, author, timestamp per line.
-L → restricts blame to specific line numbers (useful in large files).
-e → includes author’s email.
Part 3: Merging Branches
![Screenshot](55g.png)
Git performed a 3-way merge because both master and feature/feature-1 had diverging commits on the same file (example.txt).
What does git log --graph --oneline --all show after the merge?
It shows the branching structure and how the merge happened: