Compare commits
10 Commits
feature/te
...
main
Author | SHA1 | Date | |
---|---|---|---|
4bb620d7fb | |||
9af9d7f1a6 | |||
21b060bd88 | |||
f94c0f4188 | |||
0e822925e6 | |||
8cb81f15fb | |||
18dec66878 | |||
74392f016f | |||
ed9763372d | |||
62ad7dd4e6 |
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.ignore.txt
|
@ -1,36 +0,0 @@
|
||||
## Part 1: Viewing File History
|
||||
|
||||

|
||||

|
||||

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

|
||||

|
||||

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

|
||||
|
||||
## 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?
|
||||

|
||||
|
@ -2,4 +2,28 @@ 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
|
||||
- 
|
||||
- 
|
||||
1. Checking Git Version
|
||||
- 
|
||||
2. Checking Git Status
|
||||
- 
|
||||
3. Adding Files to Staging
|
||||
- 
|
||||
4. Viewing Commit History
|
||||
- 
|
||||
5. Compact History (Oneline)
|
||||
- 
|
||||
6. Visual History (Graph)
|
||||
- 
|
||||
7. Checking Differences
|
||||
- 
|
||||
8. Comparing Two Commits
|
||||
- 
|
||||
9. Exploring Branches
|
||||
- 
|
||||
10. Cloning a Repository
|
||||
- 
|
||||
11. Pulling the Code
|
||||
- 
|
||||
12. Using gitignore
|
||||
- 
|
BIN
cloned-repo.png
Normal file
After Width: | Height: | Size: 53 KiB |
@ -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
|
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 50 KiB |
BIN
git merge.png
Before Width: | Height: | Size: 52 KiB |
BIN
git_commit-commit.png
Normal file
After Width: | Height: | Size: 26 KiB |
BIN
git_commit.png
Normal file
After Width: | Height: | Size: 34 KiB |
BIN
git_diff.png
Normal file
After Width: | Height: | Size: 24 KiB |
BIN
git_ignore.png
Normal file
After Width: | Height: | Size: 32 KiB |
BIN
git_log--oneline--graph.png
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
git_log.png
Normal file
After Width: | Height: | Size: 40 KiB |
BIN
git_pull.png
Normal file
After Width: | Height: | Size: 29 KiB |
BIN
git_version.png
Normal file
After Width: | Height: | Size: 21 KiB |
@ -1 +1 @@
|
||||
Create new branch
|
||||
Create new text file
|
@ -1,2 +1,3 @@
|
||||
- Text file
|
||||
- Changes changed
|
||||
- Changes changed
|
||||
- new line added
|
7
readme.md
Normal file
@ -0,0 +1,7 @@
|
||||
- Created readme.md in a repo and renamed it to README.md
|
||||
- 
|
||||
- Git didn’t 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
After Width: | Height: | Size: 57 KiB |
BIN
repo_edit.png
Normal file
After Width: | Height: | Size: 14 KiB |
1
secret.txt
Normal file
@ -0,0 +1 @@
|
||||
this is a txt file
|