From 04959eff5ebe84478513c07fbd1f83edf5b126ac Mon Sep 17 00:00:00 2001 From: Ahzaz Malik Date: Thu, 16 Oct 2025 13:33:38 +0200 Subject: [PATCH 1/7] 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..30fbe30f2 --- /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) From 5dfbc3506f75e0022b96d09a914deba3fd530290 Mon Sep 17 00:00:00 2001 From: Ahzaz Malik Date: Thu, 16 Oct 2025 13:43:41 +0200 Subject: [PATCH 2/7] 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..ef48c262d 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1 +1,2 @@ first_name,last_name,company,title +karson,yummy,intercooler,ceo diff --git a/orgs/partners.txt b/orgs/partners.txt index 880748638..f72fee8b1 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1 +1,3 @@ partner list +Boot.dev +TheStartup From 58af1fc55e1e045ff898cd9111896c69a9be1fa6 Mon Sep 17 00:00:00 2001 From: Ahzaz Malik Date: Thu, 16 Oct 2025 13:45:07 +0200 Subject: [PATCH 3/7] D: add jayson to customer --- customers/all.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/customers/all.csv b/customers/all.csv index 16dd7b21e..734dbd659 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1 +1,2 @@ first_name,last_name,company,title +jayson,gross,htmz,contributor From dddf35c8a5f47f570f1e73f463baae88cef2ab40 Mon Sep 17 00:00:00 2001 From: Ahzaz Malik Date: Fri, 17 Oct 2025 14:13:06 +0200 Subject: [PATCH 4/7] F: multi merge conflict --- customers/all.csv | 1 - orgs/partners.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/customers/all.csv b/customers/all.csv index 734dbd659..16dd7b21e 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1,2 +1 @@ first_name,last_name,company,title -jayson,gross,htmz,contributor diff --git a/orgs/partners.txt b/orgs/partners.txt index f72fee8b1..3954648de 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,3 +1,3 @@ partner list -Boot.dev + TheStartup From 7b64a34f677aa763031db9b021300ac1e168295e Mon Sep 17 00:00:00 2001 From: Ahzaz Malik Date: Fri, 17 Oct 2025 14:15:51 +0200 Subject: [PATCH 5/7] G: Multi merge on main --- 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 734dbd659..91ac78526 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1,2 +1,2 @@ first_name,last_name,company,title -jayson,gross,htmz,contributor +carson,gross,htmx,creator diff --git a/orgs/partners.txt b/orgs/partners.txt index f72fee8b1..2f6c37ace 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,3 +1,3 @@ partner list -Boot.dev +SalesInc TheStartup From 73e7f3716475002fc7e01e08639e1df28acef14d Mon Sep 17 00:00:00 2001 From: Ahzaz Malik Date: Mon, 20 Oct 2025 10:00:14 +0200 Subject: [PATCH 6/7] J: redacted --- customers/banned.csv | 3 +++ customers/favs.md | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 customers/banned.csv create mode 100644 customers/favs.md diff --git a/customers/banned.csv b/customers/banned.csv new file mode 100644 index 000000000..19d24cf91 --- /dev/null +++ b/customers/banned.csv @@ -0,0 +1,3 @@ +first_name,last_name,company,title +Kayha,tbd,TheMarchOfTime,sidekick +sam,ctrlman,closedai,ceo diff --git a/customers/favs.md b/customers/favs.md new file mode 100644 index 000000000..bfe19c681 --- /dev/null +++ b/customers/favs.md @@ -0,0 +1,3 @@ +# Favorite Customers +* Jesse Pinkman, Heisenberg's Assistant +* Walter White, Heisenberg, Chemist From f8630c1713821cbe044b5669a57aeb0d67c130c0 Mon Sep 17 00:00:00 2001 From: Ahzaz Malik Date: Wed, 22 Oct 2025 16:02:17 +0200 Subject: [PATCH 7/7] K: Squashing at my own branch --- scripts/scan.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/scan.sh b/scripts/scan.sh index f4d9eb226..be676a78a 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 ========="