1 Commits

Author SHA1 Message Date
62ad7dd4e6 added new screenshots 2025-08-23 09:41:06 +05:30
16 changed files with 1 additions and 44 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

@ -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

BIN
git_commit-commit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
git_commit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
git_diff.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
git_log--oneline--graph.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
git_log.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -1 +1 @@
Create new branch
Create new text file