From 8c1494b354bdb0a31b9506a882386a00f963499b Mon Sep 17 00:00:00 2001 From: Calin Schurig Date: Mon, 28 Apr 2025 12:02:31 -0600 Subject: [PATCH 1/2] added my email --- email.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/email.txt b/email.txt index e69de29..ae7576a 100644 --- a/email.txt +++ b/email.txt @@ -0,0 +1 @@ +calinschurig@gmail.com From 230ef4fa6b1fce837746c13592e8830063a97e90 Mon Sep 17 00:00:00 2001 From: Calin Schurig Date: Mon, 28 Apr 2025 12:47:03 -0600 Subject: [PATCH 2/2] Attempt 1 --- gitScript1.sh | 10 ++++++++++ gitScript2.sh | 5 +++++ repo2/git-clone | 1 + 3 files changed, 16 insertions(+) create mode 160000 repo2/git-clone diff --git a/gitScript1.sh b/gitScript1.sh index e69de29..5fe4c87 100644 --- a/gitScript1.sh +++ b/gitScript1.sh @@ -0,0 +1,10 @@ +git init +git branch -m main +git add helloworld.py +git commit -m"added helloworld.py" +git branch -c branch1 +git switch branch1 +git add git_check.py +git commit -m"added git_check.y" +git switch main +git merge branch1 diff --git a/gitScript2.sh b/gitScript2.sh index e69de29..4b57411 100644 --- a/gitScript2.sh +++ b/gitScript2.sh @@ -0,0 +1,5 @@ +git clone https://github.com/BYUComputingBootCampTests/git-clone +cd git-clone +git diff HEAD~1 HEAD -- door.py | git apply - -R --apply +git add -A +git commit -m"reverted bad change to door.py" diff --git a/repo2/git-clone b/repo2/git-clone new file mode 160000 index 0000000..ee3cdf5 --- /dev/null +++ b/repo2/git-clone @@ -0,0 +1 @@ +Subproject commit ee3cdf5f3eae41913bb9eeae386158655e44e069