From 971ce2ad94918f09bb841f147d39d292b6603f88 Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Tue, 16 Sep 2025 19:31:27 +0800 Subject: [PATCH 1/8] First diff answer --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 8a18331..fd3e3d8 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,11 @@ This is a repo to help you practice diffing! Fill in what each of the elements of the diff mean (if you are not sure just guess!): **①**: > Insert your explanation here +Answer: +diff --git a/README.md b/README.md ① +command to get difference/changes between the files/commits, whereas it is a same file "README.md" +- a/README.md - Before the changes ++ b/README.md - After the changes **②**: > Insert your answer here From 534036a6e82beabb85a78efaeb79438e97bf6dbf Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Tue, 16 Sep 2025 20:10:40 +0800 Subject: [PATCH 2/8] Second diff answer --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fd3e3d8..3e3d2f5 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,18 @@ Fill in what each of the elements of the diff mean (if you are not sure just gue > Insert your explanation here Answer: diff --git a/README.md b/README.md ① -command to get difference/changes between the files/commits, whereas it is a same file "README.md" +This format shows difference/changes between the files, whereas it is a same file "README.md" - a/README.md - Before the changes + b/README.md - After the changes +git show "commitID" - will show the differences between files by + the lines which have '-' sign denotes the a (README.md) file + the lines which have '+' sign dentotes the b (README.md) file **②**: > Insert your answer here +Answer: +index 7f35690..14cf26a 100644 ② +Index is the bin file which shows the changes between the 7f35690..14cf26a **③**: > Insert your explanation here From 300481a83d09ab3826c54c65f91b8935aaf29cad Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Sun, 21 Sep 2025 19:45:19 +0800 Subject: [PATCH 3/8] Second diff answer --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e3d2f5..890e37f 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ git show "commitID" - will show the differences between files by > Insert your answer here Answer: index 7f35690..14cf26a 100644 ② -Index is the bin file which shows the changes between the 7f35690..14cf26a +Index is the bin file which shows the changes between the 7f35690..14cf26a and 100644 is the file format **③**: > Insert your explanation here From 0a0a8bb7771d806aa76ac2ffc3d25f64d90dd908 Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Sun, 21 Sep 2025 19:47:27 +0800 Subject: [PATCH 4/8] Third diff answer --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 890e37f..0e06206 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,9 @@ Index is the bin file which shows the changes between the 7f35690..14cf26a and **③**: > Insert your explanation here +Answer: +--- a/README.md ③ +Denotes the first/previous occurence of README.md file **④**: > Insert your answer here From 57e6be90a1d6f0a77c7227235a8747ab3f0d7cb0 Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Sun, 21 Sep 2025 19:52:48 +0800 Subject: [PATCH 5/8] Fourth diff answer --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0e06206..1ccc0d8 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,10 @@ Denotes the first/previous occurence of README.md file **④**: > Insert your answer here +Answer: +@@ -8,9 +8,12 @@ ④ +The original file had 9 lines at line no 8 and the updated file has 12 lines at line no 8 + **⑤**: > Insert your answer here From 080a9563b7271c46715f75dc4dfeba38a99ead86 Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Sun, 21 Sep 2025 20:08:20 +0800 Subject: [PATCH 6/8] Fifth diff answer --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ccc0d8..29d9265 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,9 @@ The original file had 9 lines at line no 8 and the updated file has 12 lines at **⑤**: > Insert your answer here - +Answer +1. Fork this repo ⑤ +Fork this repo means taking a personal copy in your account without affecting the original repository **⑥**: > Insert your explanation here From 756ecabc398a30c7a0a84f744c5d7299596663b3 Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Sun, 21 Sep 2025 20:10:23 +0800 Subject: [PATCH 7/8] Sixth diff answer --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 29d9265..aef7733 100644 --- a/README.md +++ b/README.md @@ -84,8 +84,12 @@ The original file had 9 lines at line no 8 and the updated file has 12 lines at Answer 1. Fork this repo ⑤ Fork this repo means taking a personal copy in your account without affecting the original repository + **⑥**: > Insert your explanation here +Answer: +-2. Clone your forked repo ⑥ - was in the original file ++2. Clone your forked repo: - updated this line with this content **⑦**: > Insert your answer here From a7e6970915a41186ba10006cda0fdb54d928b29b Mon Sep 17 00:00:00 2001 From: 20155043 <20155043@tafe.wa.edu.au> Date: Sun, 21 Sep 2025 20:12:10 +0800 Subject: [PATCH 8/8] Seventh diff answer --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index aef7733..8c0f33c 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,11 @@ Answer: **⑦**: > Insert your answer here +-Follow these instructions c.a.r.e.f.u.l.l.y. ⑦ ++Follow these instructions carefully. + +First line (-) was updated as the second line (+) + Notice that the diff above only showed different **lines** in the file. Including whitespaces. We can also highlight changes at the word level with the --word-diff option: