10 Commits

Author SHA1 Message Date
4bb620d7fb added new steps 2025-09-04 12:16:34 +05:30
9af9d7f1a6 new file created 2025-09-04 11:54:54 +05:30
21b060bd88 updated file 2025-09-01 17:46:23 +05:30
f94c0f4188 added new file 2025-09-01 17:41:43 +05:30
0e822925e6 added git_ignore 2025-09-01 10:54:49 +05:30
8cb81f15fb changes added to screenshots 2025-08-30 13:13:49 +05:30
18dec66878 added all the screenshots 2025-08-30 13:10:37 +05:30
74392f016f Added new hidden txt file 2025-08-30 11:11:52 +05:30
ed9763372d Update notes.txt 2025-08-30 05:31:22 +00:00
62ad7dd4e6 added new screenshots 2025-08-23 09:41:06 +05:30
28 changed files with 38 additions and 46 deletions

1
.env Normal file
View File

@ -0,0 +1 @@
added env file

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.ignore.txt

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

@ -3,3 +3,27 @@ Step 1 : Create new empty repository
- Created a new repository named as git-practice-Ajishini - Created a new repository named as git-practice-Ajishini
- Created with no README, no .gitignore and no license - Created with no README, no .gitignore and no license
- ![Repository_Screenshot](GIT_ASSIGNMENT.png) - ![Repository_Screenshot](GIT_ASSIGNMENT.png)
1. Checking Git Version
- ![Repository_Screenshot](git_version.png)
2. Checking Git Status
- ![Repository_Screenshot](git_status.png)
3. Adding Files to Staging
- ![Repository_Screenshot](git_add.png)
4. Viewing Commit History
- ![Repository_Screenshot](git_log.png)
5. Compact History (Oneline)
- ![Repository_Screenshot](git_log--oneline--graph.png)
6. Visual History (Graph)
- ![Repository_Screenshot](git_log--oneline--graph.png)
7. Checking Differences
- ![Repository_Screenshot](git_diff.png)
8. Comparing Two Commits
- ![Repository_Screenshot](git_commit-commit.png)
9. Exploring Branches
- ![Repository_Screenshot](git_checkout.png)
10. Cloning a Repository
- ![Repository_Screenshot](cloned-repo.png)
11. Pulling the Code
- ![Repository_Screenshot](git_pull.png)
12. Using gitignore
- ![Repository_Screenshot](git_ignore.png)

BIN
cloned-repo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

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_ignore.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 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

BIN
git_pull.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
git_version.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

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

View File

@ -1,2 +1,3 @@
- Text file - Text file
- Changes changed - Changes changed
- new line added

7
readme.md Normal file
View File

@ -0,0 +1,7 @@
- Created readme.md in a repo and renamed it to README.md
- ![Repository_Screenshot](readme.png)
- Git didnt show changes because windows system is case-insensitive
- Fixed it using:
`git mv -f readme.md README.md`
`git commit -m "Rename readme.md to README.md"`
- Reason: Git is case-sensitive, but case-insensitive filesystems treat both names as the same

BIN
readme.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

BIN
repo_edit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

1
secret.txt Normal file
View File

@ -0,0 +1 @@
this is a txt file