1.6 KiB
1.6 KiB
Viewing File History
1. git log -- assignment.txt
2. git log -p -- assignment.txt
3. git log --oneline -- assignment.txt
How many commits modified this file?
3 commits
What differences do you see when adding the -p option?
Shows detailed changes for each commit in the file.
Viewing File History with Blame
1. git blame assignment.txt
2. git blame -L 1,5 assignment.txt
3. git blame assignment.txt
Who changed each line of the file?
Renejit
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.
Merging Branches
Merge Conflict
Did Git perform a fast-forward merge or a 3-way merge?
Perform fast-forward merge and merge conflict
What does git log --graph --oneline --all show after the merge?
git log --graph --oneline --all after Merge conflict
