From 153808940a5b976b104b7a37a91e938b2de766fb Mon Sep 17 00:00:00 2001
From: Caden77 <cadenbrinkman@gmail.com>
Date: Tue, 30 Apr 2024 10:21:32 -0600
Subject: [PATCH] completed git test files

---
 email.txt        |  1 +
 gitScript1.sh    | 24 ++++++++++++++++++++++++
 gitScript2.sh    | 12 ++++++++++++
 repo1/.gitconfig |  0
 repo2/git-clone  |  1 +
 5 files changed, 38 insertions(+)
 create mode 100644 repo1/.gitconfig
 create mode 160000 repo2/git-clone

diff --git a/email.txt b/email.txt
index e69de29..22b4235 100644
--- a/email.txt
+++ b/email.txt
@@ -0,0 +1 @@
+cadenbrinkman@gmail.com
diff --git a/gitScript1.sh b/gitScript1.sh
index e69de29..7bdd264 100644
--- a/gitScript1.sh
+++ b/gitScript1.sh
@@ -0,0 +1,24 @@
+git branch
+git init
+git branch
+git status
+git branch -m master main
+git status
+git add helloworld.py
+git status
+git commit -m "adding hello world for part A3"
+git branch branch1
+git branch
+git checkout branch1
+ls
+git add git_check.py
+git commit -m "adding git_check.py for part A5"
+git status
+git branch
+git checkout main
+git branch
+git merge branch1
+git status
+git diff branch1
+ls
+ls -a
diff --git a/gitScript2.sh b/gitScript2.sh
index e69de29..b8ef014 100644
--- a/gitScript2.sh
+++ b/gitScript2.sh
@@ -0,0 +1,12 @@
+cd repo2
+ls
+git clone https://github.com/BYUComputingBootCampTests/git-clone.git
+ls
+cd git-clone/
+ls
+git log
+git diff b1cab
+git checkout b1cab door.py
+git status
+git commit -m "restored previous door.py file for part B5"
+
diff --git a/repo1/.gitconfig b/repo1/.gitconfig
new file mode 100644
index 0000000..e69de29
diff --git a/repo2/git-clone b/repo2/git-clone
new file mode 160000
index 0000000..e149a96
--- /dev/null
+++ b/repo2/git-clone
@@ -0,0 +1 @@
+Subproject commit e149a96fea64d1dd4958f76d57c5a1bdb8adbb50