From 0f521f24fb76ba4102777a3e6ce2db59c135ee9a Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Tue, 2 Jun 2026 14:53:58 +0200 Subject: [PATCH 1/8] B: recovery --- slander.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 slander.md diff --git a/slander.md b/slander.md new file mode 100644 index 000000000..c61369af4 --- /dev/null +++ b/slander.md @@ -0,0 +1,4 @@ +# Breaking News + +MegaCorp CEO Lane enjoyed the live-action Last Airbender movie +MegaCorp CTO ThePrimeagen is a fan of The Notebook (and most other Nicholas Sparks content)% \ No newline at end of file From 41a181032274fe1577c4785e72f2759024981f7c Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Wed, 3 Jun 2026 13:30:02 +0200 Subject: [PATCH 2/8] C: update customers and partners --- customers/all.csv | 1 + orgs/partners.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/customers/all.csv b/customers/all.csv index 16dd7b21e..884a55a15 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1 +1,2 @@ first_name,last_name,company,title +karson,yummy,intercooler,ceo \ No newline at end of file diff --git a/orgs/partners.txt b/orgs/partners.txt index 880748638..93abf2117 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1 +1,3 @@ partner list +Boot.dev +TheStartup \ No newline at end of file From 2e8fd0dad6238bad6f9937479606f52b976e45cb Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Wed, 3 Jun 2026 13:36:11 +0200 Subject: [PATCH 3/8] D: --- customers/all.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/customers/all.csv b/customers/all.csv index 16dd7b21e..9ca3b90b1 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1 +1,2 @@ first_name,last_name,company,title +jayson,gross,htmz,contributor \ No newline at end of file From a57e0a89d81e389b4054c15a11d20bc2dd0c89e7 Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Wed, 3 Jun 2026 14:43:35 +0200 Subject: [PATCH 4/8] F: --- orgs/partners.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orgs/partners.txt b/orgs/partners.txt index 93abf2117..24b4c33fe 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,3 +1,3 @@ partner list -Boot.dev + TheStartup \ No newline at end of file From 71c1dbaa99f60be85d6db00b9a89664801cb34cf Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Wed, 3 Jun 2026 14:44:40 +0200 Subject: [PATCH 5/8] G: --- customers/all.csv | 2 +- orgs/partners.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/customers/all.csv b/customers/all.csv index 507f1d7fa..91ac78526 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1,2 +1,2 @@ first_name,last_name,company,title - +carson,gross,htmx,creator diff --git a/orgs/partners.txt b/orgs/partners.txt index 93abf2117..e25dfe69d 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,3 +1,3 @@ partner list -Boot.dev +SalesInc TheStartup \ No newline at end of file From fe042a5e31690e2f1aafd7aab35b637149e191d8 Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Wed, 3 Jun 2026 14:53:41 +0200 Subject: [PATCH 6/8] H: --- orgs/partners.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/orgs/partners.txt b/orgs/partners.txt index b127ea846..2e819de9f 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,7 +1,4 @@ partner list -<<<<<<< HEAD SalesInc -======= ->>>>>>> delete_records TheStartup \ No newline at end of file From 77808d3dc34301dee98514dde748a5650cdb30b9 Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Wed, 3 Jun 2026 15:04:30 +0200 Subject: [PATCH 7/8] J: redacted --- README.md | 3 --- customers/banned.csv | 3 +++ customers/favs.md | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 README.md create mode 100644 customers/banned.csv create mode 100644 customers/favs.md diff --git a/README.md b/README.md deleted file mode 100644 index 13b4fae17..000000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# megacorp - -The starter repo for the [Git 2 course](https://www.boot.dev/learn/learn-git-2) on Boot.dev. diff --git a/customers/banned.csv b/customers/banned.csv new file mode 100644 index 000000000..b01b34169 --- /dev/null +++ b/customers/banned.csv @@ -0,0 +1,3 @@ +first_name,last_name,company,title +Ballan,Agrandian,Boots.lore,Protagonist +sam,ctrlman,closedai,ceo \ No newline at end of file diff --git a/customers/favs.md b/customers/favs.md new file mode 100644 index 000000000..fa00c6418 --- /dev/null +++ b/customers/favs.md @@ -0,0 +1,6 @@ +# Favorite Customers +<<<<<<< HEAD +* Jesse Pinkman, Heisenberg's Assistant +======= +* Walter White, Heisenberg, Chemist +>>>>>>> e4c6fcb (K:) From 0d0b462379916d3237b51a377cf51029bcedd5a3 Mon Sep 17 00:00:00 2001 From: hugo-a-d Date: Thu, 4 Jun 2026 12:53:19 +0200 Subject: [PATCH 8/8] K: --- scripts/scan.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/scan.sh b/scripts/scan.sh index f4d9eb226..0fb03d396 100755 --- a/scripts/scan.sh +++ b/scripts/scan.sh @@ -1 +1,10 @@ -# TODO: write the script +printf "\n====== SCANNING FOR CREDIT CARD NUMBERS ======\n" +grep -rE --color=always '(\b[0-9]{4}[- ]?){3}[0-9]{4}\b' . --exclude-dir={.git} --line-number +echo "========= CREDIT CARD SCAN COMPLETE ==========" +printf "\n==== SCANNING FOR SOCIAL SECURITY NUMBERS ====\n" +grep -rE --color=always '\b[0-9]{3}-[0-9]{2}-[0-9]{4}\b' . --exclude-dir={.git} --line-number +echo "======= SOCIAL SECURITY SCAN COMPLETE ========" +printf "\n========= SCANNING FOR PHONE NUMBERS =========\n" +grep -rE --color=always '\b[0-9]{3}-[0-9]{3}-[0-9]{4}\b' . --exclude-dir={.git} --line-number +grep -rE --color=always '\([0-9]{3}\) [0-9]{3}-[0-9]{4}' . --exclude-dir={.git} --line-number +echo "========= PHONE NUMBER SCAN COMPLETE =========" \ No newline at end of file