29 Commits

Author SHA1 Message Date
fcd60f6174 Updated the MD file 2025-09-17 16:59:58 +05:30
d7b7bf6869 resolving the merge conflit 2025-09-17 16:43:10 +05:30
9780a29da2 merge learning with main branch 2025-09-17 16:36:46 +05:30
4ad4593de8 edited example file in learning 2025-09-17 16:32:44 +05:30
d9f12151a2 edited example file in main 2025-09-17 16:30:27 +05:30
06f4ad109d Merge branch feature/feature-1 2025-09-11 09:09:17 +05:30
53d8158a78 line added from main 2025-09-11 09:07:02 +05:30
8941b1faf8 line added from feature-1 branch 2025-09-11 09:06:09 +05:30
5633539d29 Merge branch 'feature/feature-1' 2025-09-11 09:03:57 +05:30
c742d31f06 sixth line added from main 2025-09-11 08:32:50 +05:30
baa3fdb40d sixth line added in example file 2025-09-11 08:30:53 +05:30
dc7fc33063 fifth line added 2025-09-11 00:01:50 +05:30
f97b76b325 fourth line added 2025-09-11 00:00:58 +05:30
ec0f5f8e12 example file updated 2025-09-10 23:41:01 +05:30
6a0d306fbf Updated MD file 2025-09-10 17:54:59 +05:30
ae37ccf579 Added wednesday 2025-09-10 16:29:53 +05:30
818379d412 Added date 2025-09-10 16:29:15 +05:30
f04a9ca2fe Added assignment number to example file 2025-09-10 16:28:17 +05:30
cbc5e0c771 Updated example file 2025-09-10 16:26:37 +05:30
1f63ae97fb Adding example file 2025-09-10 16:23:58 +05:30
fc3d883e78 Updated Readme 2025-09-04 11:51:40 +05:30
b2d5453bd4 Updated Readme file 2025-09-04 11:42:03 +05:30
6d04a8313b Add readme.md 2025-09-04 10:10:54 +05:30
935a42820f Updated git ignore images 2025-09-02 15:54:44 +05:30
3990ff2f28 Updated the MD file 2025-08-27 21:44:37 +05:30
5b645a8eec Added git push image to MD file 2025-08-27 21:34:14 +05:30
298f362201 Updating the assignment 2025-08-27 21:29:26 +05:30
31700ab7fd Add .gitignore to ignore secret.txt 2025-08-27 20:00:12 +05:30
4cc845f31d Added assinment file to main branch 2025-08-27 19:56:02 +05:30
27 changed files with 127 additions and 0 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
techthursday.txt
git_commands.txt

View File

View File

@ -100,3 +100,104 @@ Version control (like Git) keeps one central version of the file, records who ma
---
## 9. Adding & Managing Remotes
## Git Remote
![Git origin](git_origin.png)
![Git remote](git_origin_remote.png)
---
## 10. Pushing & Pulling Changes
## Git Pull
![Git pull](git_pull.png)
## Git Push
![Git push](gitpush.png)
---
## 11. Ignoring Files with .gitignore
## .gitignore
![.gitignore](gitignore.png)
## Before git ignore
![.gitignore](before_git_ignore.png)
## After git ignore
![.gitignore](after_git_ignore.png)
---
## Part 1: Viewing File History
## git log -- filename.extension
![.git log -- example.txt](git_log_example.png)
## git log -p -- filename.extension
![git log -p](git_log_example_p1.png)
![git log -p](git_log_example_p2.png)
![git log -p](git_log_example_p3.png)
## git log --oneline -- filename.extension
![git log --oneline](git_log_example_oneline.png)
---
How many commits modified this file?
5
What differences do you see when adding the -p option?
It shows the detailed changes made to the file during the commit
---
## Part 2: Viewing File History with Blame
## git blame -- filename.extension
![.git blame -- assignment.txt](git_blame.png)
## git blame -L 1,5 -- filename.extension
![git blame -L 1,5](git_bame_L.png)
## git blame -e -- filename.extension
![git blame -e](git_blame_e.png)
---
Who changed each line of the file?
Gokul
How does -L help when the file is large?
It acts as a selection area to select the lines between the given numbers
What extra information does -e provide?
It shows the commiters email id
---
## Part 3: Merging Branches
## git merge
![merge fast forward](git_fast_fwd.png)
![git_merge_graph_oneline](git_merge_graph_oneline.png)
![merge 1](merge_conflict_1.png)
![merge 2](git_merge_conflict_2.png)
![merge 3](conflict3.png)
---

5
README.md Normal file
View File

@ -0,0 +1,5 @@
Why This Happens
Git uses filesystem system calls to detect changes. Case-insensitive filesystems report no difference for case-only renames, so Git's index isn't updated. core.ignorecase (set to true on such systems) aligns Git with filesystem behavior.
To change the file name we use the force Rename command : git mv -f readme.md Readme.md

BIN
after_git_ignore.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

5
assignment.txt Normal file
View File

@ -0,0 +1,5 @@
Git commit
Takes the staged snapshot and commits it to the project history. Combined with git add, this defines the basic workflow for all Git users.
Git clone
Creates a copy of an existing Git repository. Cloning is the most common way for developers to obtain a working copy of a central repository.

BIN
before_git_ignore.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
conflict3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

13
example.txt Normal file
View File

@ -0,0 +1,13 @@
Tech Thursday assignment 3 updated
date 10-09-2025
<<<<<<< HEAD
wed
wednesday
assignment completed
=======
wednesday
Practise session extended to Thursday
date 11-09-2025
New text added
line added from feature-1 branch
>>>>>>> 06f4ad109d06b03307110696e71d6e7166aaf2b7

Submodule git clone gokul/git-practice-Gokul added at b88b3e4605

BIN
git_bame_L.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
git_blame.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

BIN
git_blame_e.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

BIN
git_fast_fwd.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

BIN
git_log_example.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

BIN
git_log_example_oneline.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
git_log_example_p1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

BIN
git_log_example_p2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

BIN
git_log_example_p3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
git_merge_conflict_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
git_merge_graph_oneline.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

BIN
git_origin.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

BIN
git_origin_remote.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
git_pull.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

BIN
gitignore.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
gitpush.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

BIN
merge_conflict_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB