5 Commits

Author SHA1 Message Date
9657a1ec1c Merge branch 'feature/traning' into main 2025-09-10 21:11:47 +05:30
2912e22546 Added 1 to 10 numbers 2025-09-10 21:03:45 +05:30
1d23dbc319 Added 1 to 5 numbers 2025-09-10 21:02:15 +05:30
33ab345ffc Added fast-forward merge image 2025-09-10 20:57:57 +05:30
63e67802a8 Added images for Viewing File History with Blame 2025-09-10 17:26:46 +05:30
9 changed files with 44 additions and 3 deletions

View File

@@ -22,4 +22,36 @@
## What differences do you see when adding the -p option? ## What differences do you see when adding the -p option?
Shows detailed changes for each commit in the file. Shows detailed changes for each commit in the file.
## Viewing File History with Blame
## 1. git blame assignment.txt
![alt text](<git blame assignment.png>)
## 2. git blame -L 1,5 assignment.txt
![alt text](<git blame -L 1,5 assignment.png>)
## 3. git blame assignment.txt
![alt text](<git blame -e assignment.png>)
## 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
![alt text](<fast-forward merge-1.png>)
![alt text](<fast-forward merge-2.png>)
## What does git log --graph --oneline --all show after the merge?
![alt text](<git log--graph--oneline--all.png>)

BIN
fast-forward merge-1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

BIN
fast-forward merge-2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

View File

@@ -1,2 +1,10 @@
hello 1
Hi 2
3
4
5
6
7
8
9
10

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
git blame -e assignment.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

BIN
git blame assignment.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

1
git-practice-Renejit Submodule

Submodule git-practice-Renejit added at 8ee5230729