3 Commits

Author SHA1 Message Date
c5f812ee26 nikhils changes 3 2025-09-11 11:57:15 +05:30
a8e7e4a57b nikhils changes 2 2025-09-11 11:56:38 +05:30
cc8aec77e6 nikhils changes 2025-09-11 11:55:49 +05:30
19 changed files with 5 additions and 47 deletions

View File

@ -1,36 +0,0 @@
## Part 1: Viewing File History
![alt text](<git log --example.png>)
![alt text](<git log -p -- example.txt.png>)
![alt text](<git log --oneline -- example.txt.png>)
## 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](<git blame example.txt.png>)
![alt text](<git blame -L 1,5 example.txt.png>)
![alt text](<git blame -e example.txt.png>)
## 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](<git merge.png>)
## 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](<git log --graph --oneline --all.png>)

View File

@ -2,4 +2,8 @@ Step 1 : Create new empty repository
- Visited the Git-Training-Hub organization on Git Comorin
- Created a new repository named as git-practice-Ajishini
- Created with no README, no .gitignore and no license
- ![Repository_Screenshot](GIT_ASSIGNMENT.png)
- ![Repository_Screenshot](GIT_ASSIGNMENT.png)
Hi typed by nikhil
type 2
type 3

View File

@ -1,7 +0,0 @@
New file created
Added to git
Commit message
check the status
Switch to new branch
Check log
Added new line in the feature/testcase branch

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View File

@ -1 +0,0 @@
Create new branch

View File

@ -1,2 +0,0 @@
- Text file
- Changes changed