Compare commits
3 Commits
main
...
feature/as
Author | SHA1 | Date | |
---|---|---|---|
8ee5230729 | |||
d9cdcb5d67 | |||
bc129fd68f |
@ -137,67 +137,3 @@ Version control (like Git) keeps one central version of the file, records who ma
|
||||
|
||||
---
|
||||
|
||||
## 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
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
---
|
||||
|
BIN
conflict3.png
Before Width: | Height: | Size: 81 KiB |
21
example.txt
@ -1,13 +1,10 @@
|
||||
Tech Thursday assignment 3 updated
|
||||
Tech Thursday assignment 3
|
||||
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
|
||||
git log -- <filename> :
|
||||
shows the commmit message for a specific file.
|
||||
|
||||
git log -p --<filename> :
|
||||
shows line by line changes for each commmit in a specific file
|
||||
|
||||
git log --oneline --<filename> :
|
||||
shows commit history in short form for the specific file
|
BIN
git_bame_L.png
Before Width: | Height: | Size: 25 KiB |
BIN
git_blame.png
Before Width: | Height: | Size: 87 KiB |
BIN
git_blame_e.png
Before Width: | Height: | Size: 111 KiB |
BIN
git_fast_fwd.png
Before Width: | Height: | Size: 74 KiB |
Before Width: | Height: | Size: 60 KiB |
Before Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 97 KiB |
Before Width: | Height: | Size: 19 KiB |