From 957cecb26bf638f8255add6815a6928cdd5caa3d Mon Sep 17 00:00:00 2001 From: Jakedez Date: Mon, 11 May 2026 17:34:00 -0600 Subject: [PATCH 1/2] Completed gitTest --- email.txt | 1 + gitScript1.sh | 8 ++++++++ gitScript2.sh | 7 +++++++ repo2/git-clone | 1 + 4 files changed, 17 insertions(+) create mode 160000 repo2/git-clone diff --git a/email.txt b/email.txt index e69de29..2482dbb 100644 --- a/email.txt +++ b/email.txt @@ -0,0 +1 @@ +jakedez7@gmail.com diff --git a/gitScript1.sh b/gitScript1.sh index e69de29..c958cfb 100644 --- a/gitScript1.sh +++ b/gitScript1.sh @@ -0,0 +1,8 @@ +git init +git branch -m master main +git add helloworld.py +git commit +git branch branch1 +git switch branch1 +git add git_check.py +git commit diff --git a/gitScript2.sh b/gitScript2.sh index e69de29..e586b9b 100644 --- a/gitScript2.sh +++ b/gitScript2.sh @@ -0,0 +1,7 @@ +git clone https://github.com/BYUComputingBootCampTests/git-clone.git +cd git-clone/ +git log +git diff e4c1d b1cab +git restore --source b1cab door.py +git add door.py +git commit diff --git a/repo2/git-clone b/repo2/git-clone new file mode 160000 index 0000000..3c1a10d --- /dev/null +++ b/repo2/git-clone @@ -0,0 +1 @@ +Subproject commit 3c1a10d145732e92ff77e56fc547d473b0858c18 From 6b007c8a31d8a9d62245b5f83ed886aae4ae5f84 Mon Sep 17 00:00:00 2001 From: Jakedez Date: Mon, 11 May 2026 17:57:29 -0600 Subject: [PATCH 2/2] Completed --- gitScript1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitScript1.sh b/gitScript1.sh index c958cfb..27634bd 100644 --- a/gitScript1.sh +++ b/gitScript1.sh @@ -6,3 +6,5 @@ git branch branch1 git switch branch1 git add git_check.py git commit +git switch main +git merge branch1 main