From 66bd0c80978e0a4ecb06753e8ee6f5fc2046be2d Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Sat, 30 Sep 2023 17:42:42 -0400 Subject: [PATCH 1/9] updated- q --- notes/2023-09-26.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/notes/2023-09-26.md b/notes/2023-09-26.md index 1ee4062..6f56ab5 100644 --- a/notes/2023-09-26.md +++ b/notes/2023-09-26.md @@ -40,4 +40,7 @@ References until the full notes are added: Use an issue to submit a question for today, or make a PR to post a question and the best answer you can find (I'll review and fix if needed before posting) for a community badge. +Q: My question for today's class is if you can use reset to go forward in time commit-wise. For example, if you reset too far back, can you go back to a more recent commit. + +A: The best answer I can find is that you can revert back to a more recent commit after resetting to an older one. I also read that there is a chance git does some cleanup after a few days and deltes the commits that come after the time of the reset, making going forward in time impossible. This might only be in edge cases though. ``` \ No newline at end of file From 619fb396fe3fad443e135dd5e335259f8a7bf246 Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Thu, 5 Oct 2023 16:43:59 -0400 Subject: [PATCH 2/9] Added notes to 10-3 regarding duplicate hashes --- notes/2023-10-03.md | 1 + 1 file changed, 1 insertion(+) diff --git a/notes/2023-10-03.md b/notes/2023-10-03.md index 3b1ab50..cf0c4d2 100644 --- a/notes/2023-10-03.md +++ b/notes/2023-10-03.md @@ -612,6 +612,7 @@ git cat-file -p 2bcb 100644 blob b86eb90ba1ae5504edfcdc9ef8879e1c6d7a1b75 README.md 100644 blob 443f164cdde5059d78df6a61ca3f07bc6a605eb0 about.md ``` +- Note that you may notice repeated hashs when looking at a tree like this. While every hash is different when it comes to commits for example, they can be the same in some cases. One example where the hashes can be the same is if multiple files ("file1.md", "file2.md", "file3.md") have no content inside and are blank. In the systems eyes they are essentially the same object, so they get the same hash (not all hashing algorithms are the same, this is not always the case) Since mine is a tree we can see that it has a list of items and each item in the list includes: - mode From 20593917ab676175f6ab1ee7a3c1f97e2231fa54 Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Thu, 5 Oct 2023 17:11:35 -0400 Subject: [PATCH 3/9] added notes about repeat hashes --- notes/2023-10-03.md | 1 + 1 file changed, 1 insertion(+) diff --git a/notes/2023-10-03.md b/notes/2023-10-03.md index 3b1ab50..cf0c4d2 100644 --- a/notes/2023-10-03.md +++ b/notes/2023-10-03.md @@ -612,6 +612,7 @@ git cat-file -p 2bcb 100644 blob b86eb90ba1ae5504edfcdc9ef8879e1c6d7a1b75 README.md 100644 blob 443f164cdde5059d78df6a61ca3f07bc6a605eb0 about.md ``` +- Note that you may notice repeated hashs when looking at a tree like this. While every hash is different when it comes to commits for example, they can be the same in some cases. One example where the hashes can be the same is if multiple files ("file1.md", "file2.md", "file3.md") have no content inside and are blank. In the systems eyes they are essentially the same object, so they get the same hash (not all hashing algorithms are the same, this is not always the case) Since mine is a tree we can see that it has a list of items and each item in the list includes: - mode From f0e0a207729f1b6326d9fd0376024004d245ea80 Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Thu, 5 Oct 2023 17:28:42 -0400 Subject: [PATCH 4/9] rebasing --- notes/2023-10-03.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/notes/2023-10-03.md b/notes/2023-10-03.md index cf0c4d2..fefb70d 100644 --- a/notes/2023-10-03.md +++ b/notes/2023-10-03.md @@ -612,7 +612,10 @@ git cat-file -p 2bcb 100644 blob b86eb90ba1ae5504edfcdc9ef8879e1c6d7a1b75 README.md 100644 blob 443f164cdde5059d78df6a61ca3f07bc6a605eb0 about.md ``` +<<<<<<< HEAD - Note that you may notice repeated hashs when looking at a tree like this. While every hash is different when it comes to commits for example, they can be the same in some cases. One example where the hashes can be the same is if multiple files ("file1.md", "file2.md", "file3.md") have no content inside and are blank. In the systems eyes they are essentially the same object, so they get the same hash (not all hashing algorithms are the same, this is not always the case) +======= +>>>>>>> 1e91e97 (rebasing) Since mine is a tree we can see that it has a list of items and each item in the list includes: - mode From b217bc4209d94742187f238959cebcd4083e300e Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Sat, 30 Sep 2023 17:50:12 -0400 Subject: [PATCH 5/9] added question about resets --- notes/2023-09-26.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/notes/2023-09-26.md b/notes/2023-09-26.md index 2c7bf4d..8cd885e 100644 --- a/notes/2023-09-26.md +++ b/notes/2023-09-26.md @@ -197,5 +197,6 @@ Use an issue to submit a question for today, or make a PR to post a question and Q: My question for today's class is if you can use reset to go forward in time commit-wise. For example, if you reset too far back, can you go back to a more recent commit. -A: The best answer I can find is that you can revert back to a more recent commit after resetting to an older one. I also read that there is a chance git does some cleanup after a few days and deltes the commits that come after the time of the reset, making going forward in time impossible. This might only be in edge cases though. +A: The best answer I can find is that you can revert back to a more recent commit after resetting to an older one. I also read that there is a chance git does some cleanup after a few days and deltes the commits that come after the time of the reset, making going forward in time impossible. This might only be in edge cases though. + ``` \ No newline at end of file From efba597a51b33a2ca6951483854c0591b5e2f032 Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Thu, 5 Oct 2023 16:50:19 -0400 Subject: [PATCH 6/9] syntax fix notes/2023-09-26.md Co-authored-by: Sarah Brown --- notes/2023-09-26.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/notes/2023-09-26.md b/notes/2023-09-26.md index 8cd885e..62692a5 100644 --- a/notes/2023-09-26.md +++ b/notes/2023-09-26.md @@ -195,8 +195,8 @@ write your `git log` to a file and include it with your experience report. Use an issue to submit a question for today, or make a PR to post a question and the best answer you can find (I'll review and fix if needed before posting) for a community badge. -Q: My question for today's class is if you can use reset to go forward in time commit-wise. For example, if you reset too far back, can you go back to a more recent commit. +``` +### Can use reset to go forward in time commit-wise. For example, if you reset too far back, can you go back to a more recent commit? -A: The best answer I can find is that you can revert back to a more recent commit after resetting to an older one. I also read that there is a chance git does some cleanup after a few days and deltes the commits that come after the time of the reset, making going forward in time impossible. This might only be in edge cases though. +The best answer I can find is that you can revert back to a more recent commit after resetting to an older one. I also read that there is a chance git does some cleanup after a few days and deltes the commits that come after the time of the reset, making going forward in time impossible. This might only be in edge cases though. -``` \ No newline at end of file From dff041f5d5430a9aa0ac15675cb6b80c28b6bbb1 Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Thu, 5 Oct 2023 22:07:11 +0000 Subject: [PATCH 7/9] fix_notes --- notes/2023-10-03.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/notes/2023-10-03.md b/notes/2023-10-03.md index fefb70d..cf0c4d2 100644 --- a/notes/2023-10-03.md +++ b/notes/2023-10-03.md @@ -612,10 +612,7 @@ git cat-file -p 2bcb 100644 blob b86eb90ba1ae5504edfcdc9ef8879e1c6d7a1b75 README.md 100644 blob 443f164cdde5059d78df6a61ca3f07bc6a605eb0 about.md ``` -<<<<<<< HEAD - Note that you may notice repeated hashs when looking at a tree like this. While every hash is different when it comes to commits for example, they can be the same in some cases. One example where the hashes can be the same is if multiple files ("file1.md", "file2.md", "file3.md") have no content inside and are blank. In the systems eyes they are essentially the same object, so they get the same hash (not all hashing algorithms are the same, this is not always the case) -======= ->>>>>>> 1e91e97 (rebasing) Since mine is a tree we can see that it has a list of items and each item in the list includes: - mode From 7bbe4051e905ec34d0a700dde26953664ffb38b3 Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Sat, 14 Oct 2023 19:50:26 -0400 Subject: [PATCH 8/9] picked out only right file to be committed --- notes/2023-10-03.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/notes/2023-10-03.md b/notes/2023-10-03.md index cf0c4d2..a786757 100644 --- a/notes/2023-10-03.md +++ b/notes/2023-10-03.md @@ -700,21 +700,21 @@ If your object was a blob, look at the type of the next one up in your find outp ``` -## Prepare for Next Class -```{include} ../_prepare/2023-10-05.md +## Review today's class + +```{include} ../_review/2023-10-05.md ``` -## Review today's class +## Prepare for Next Class -```{include} ../_review/2023-10-03.md +```{include} ../_prepare/2023-10-03.md ``` - ## More Practice ```{include} ../_practice/2023-10-03.md From e20578a64e7a2860bdd142399273ac93d6dfad7a Mon Sep 17 00:00:00 2001 From: NoahV17 Date: Sat, 14 Oct 2023 19:57:15 -0400 Subject: [PATCH 9/9] now correct files --- notes/2023-10-03.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/notes/2023-10-03.md b/notes/2023-10-03.md index 3b4bebb..a786757 100644 --- a/notes/2023-10-03.md +++ b/notes/2023-10-03.md @@ -612,6 +612,7 @@ git cat-file -p 2bcb 100644 blob b86eb90ba1ae5504edfcdc9ef8879e1c6d7a1b75 README.md 100644 blob 443f164cdde5059d78df6a61ca3f07bc6a605eb0 about.md ``` +- Note that you may notice repeated hashs when looking at a tree like this. While every hash is different when it comes to commits for example, they can be the same in some cases. One example where the hashes can be the same is if multiple files ("file1.md", "file2.md", "file3.md") have no content inside and are blank. In the systems eyes they are essentially the same object, so they get the same hash (not all hashing algorithms are the same, this is not always the case) Since mine is a tree we can see that it has a list of items and each item in the list includes: - mode @@ -702,7 +703,7 @@ If your object was a blob, look at the type of the next one up in your find outp ## Review today's class -```{include} ../_review/2023-10-03.md +```{include} ../_review/2023-10-05.md ```