3 Commits

Author SHA1 Message Date
8ee5230729 added explanation 2025-09-10 17:05:34 +05:30
d9cdcb5d67 removed day 2025-09-10 16:59:03 +05:30
bc129fd68f added git log -- <filename> explanation 2025-09-10 16:57:23 +05:30
16 changed files with 9 additions and 77 deletions

View File

@ -137,67 +137,3 @@ Version control (like Git) keeps one central version of the file, records who ma
---
## Part 1: Viewing File History
## git log -- filename.extension
![.git log -- example.txt](git_log_example.png)
## git log -p -- filename.extension
![git log -p](git_log_example_p1.png)
![git log -p](git_log_example_p2.png)
![git log -p](git_log_example_p3.png)
## git log --oneline -- filename.extension
![git log --oneline](git_log_example_oneline.png)
---
How many commits modified this file?
5
What differences do you see when adding the -p option?
It shows the detailed changes made to the file during the commit
---
## Part 2: Viewing File History with Blame
## git blame -- filename.extension
![.git blame -- assignment.txt](git_blame.png)
## git blame -L 1,5 -- filename.extension
![git blame -L 1,5](git_bame_L.png)
## git blame -e -- filename.extension
![git blame -e](git_blame_e.png)
---
Who changed each line of the file?
Gokul
How does -L help when the file is large?
It acts as a selection area to select the lines between the given numbers
What extra information does -e provide?
It shows the commiters email id
---
## Part 3: Merging Branches
## git merge
![merge fast forward](git_fast_fwd.png)
![git_merge_graph_oneline](git_merge_graph_oneline.png)
![merge 1](merge_conflict_1.png)
![merge 2](git_merge_conflict_2.png)
![merge 3](conflict3.png)
---

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

View File

@ -1,13 +1,10 @@
Tech Thursday assignment 3 updated
Tech Thursday assignment 3
date 10-09-2025
<<<<<<< HEAD
wed
wednesday
assignment completed
=======
wednesday
Practise session extended to Thursday
date 11-09-2025
New text added
line added from feature-1 branch
>>>>>>> 06f4ad109d06b03307110696e71d6e7166aaf2b7
git log -- <filename> :
shows the commmit message for a specific file.
git log -p --<filename> :
shows line by line changes for each commmit in a specific file
git log --oneline --<filename> :
shows commit history in short form for the specific file

Submodule git clone gokul/git-practice-Gokul deleted from b88b3e4605

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB