Files
git-practice-Ajishini/ASSIGNMENT-04-09-2025.md
2025-09-11 12:28:16 +05:30

1019 B

Part 1: Viewing File History

alt text alt text alt text

How many commits modified this file?

7 commits

What differences do you see when adding the -p option?

Shows detailed changes for each commit in the file.

Part 2: Viewing File History with Blame

alt text alt text alt text

Who changed each line of the file?

Ajishini, Solomon

How does -L help when the file is large?

To view the history of specific lines in a file.

What extra information does -e provide?

To get the email id of the user who made the chages in the file.

Part 3: Merging Branches

alt text

Did Git perform a fast-forward merge or a 3-way merge?

Merge conflict

What does git log --graph --oneline --all show after the merge?

alt text