git-practice-ash/ASSIGNMENT-04-09-2025.md

Part 1: Viewing File History

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

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

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: