Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
fcd60f6174 | |||
d7b7bf6869 | |||
9780a29da2 | |||
4ad4593de8 | |||
d9f12151a2 | |||
06f4ad109d | |||
53d8158a78 | |||
8941b1faf8 | |||
5633539d29 | |||
c742d31f06 | |||
baa3fdb40d | |||
dc7fc33063 | |||
f97b76b325 | |||
ec0f5f8e12 | |||
6a0d306fbf | |||
ae37ccf579 | |||
818379d412 | |||
f04a9ca2fe | |||
cbc5e0c771 | |||
1f63ae97fb | |||
fc3d883e78 | |||
b2d5453bd4 | |||
6d04a8313b | |||
935a42820f | |||
3990ff2f28 | |||
5b645a8eec | |||
298f362201 | |||
31700ab7fd | |||
4cc845f31d |
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
techthursday.txt
|
||||
git_commands.txt
|
0
.gitignore_folder/secret.txt
Normal 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
|
||||
|
||||

|
||||

|
||||
|
||||
---
|
||||
|
||||
## 10. Pushing & Pulling Changes
|
||||
|
||||
## Git Pull
|
||||
|
||||

|
||||
|
||||
## Git Push
|
||||
|
||||

|
||||
|
||||
---
|
||||
|
||||
## 11. Ignoring Files with .gitignore
|
||||
|
||||
## .gitignore
|
||||
|
||||

|
||||
|
||||
## Before git ignore
|
||||
|
||||

|
||||
|
||||
## After git ignore
|
||||
|
||||

|
||||
|
||||
---
|
||||
|
||||
## Part 1: Viewing File History
|
||||
|
||||
## git log -- filename.extension
|
||||
|
||||

|
||||
|
||||
## git log -p -- filename.extension
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
## git log --oneline -- filename.extension
|
||||
|
||||

|
||||
|
||||
---
|
||||
|
||||
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 -L 1,5 -- filename.extension
|
||||
|
||||

|
||||
|
||||
## git blame -e -- filename.extension
|
||||
|
||||

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

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
---
|
||||
|
5
README.md
Normal 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
After Width: | Height: | Size: 39 KiB |
5
assignment.txt
Normal 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
After Width: | Height: | Size: 20 KiB |
BIN
conflict3.png
Normal file
After Width: | Height: | Size: 81 KiB |
13
example.txt
Normal 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
|
1
git clone gokul/git-practice-Gokul
Submodule
BIN
git_bame_L.png
Normal file
After Width: | Height: | Size: 25 KiB |
BIN
git_blame.png
Normal file
After Width: | Height: | Size: 87 KiB |
BIN
git_blame_e.png
Normal file
After Width: | Height: | Size: 111 KiB |
BIN
git_fast_fwd.png
Normal file
After Width: | Height: | Size: 74 KiB |
BIN
git_log_example.png
Normal file
After Width: | Height: | Size: 60 KiB |
BIN
git_log_example_oneline.png
Normal file
After Width: | Height: | Size: 19 KiB |
BIN
git_log_example_p1.png
Normal file
After Width: | Height: | Size: 61 KiB |
BIN
git_log_example_p2.png
Normal file
After Width: | Height: | Size: 50 KiB |
BIN
git_log_example_p3.png
Normal file
After Width: | Height: | Size: 23 KiB |
BIN
git_merge_conflict_2.png
Normal file
After Width: | Height: | Size: 14 KiB |
BIN
git_merge_graph_oneline.png
Normal file
After Width: | Height: | Size: 97 KiB |
BIN
git_origin.png
Normal file
After Width: | Height: | Size: 50 KiB |
BIN
git_origin_remote.png
Normal file
After Width: | Height: | Size: 16 KiB |
BIN
git_pull.png
Normal file
After Width: | Height: | Size: 36 KiB |
BIN
gitignore.png
Normal file
After Width: | Height: | Size: 30 KiB |
BIN
gitpush.png
Normal file
After Width: | Height: | Size: 38 KiB |
BIN
merge_conflict_1.png
Normal file
After Width: | Height: | Size: 19 KiB |