diff --git a/email.txt b/email.txt index e69de29..b7c62a2 100644 --- a/email.txt +++ b/email.txt @@ -0,0 +1 @@ +hyperdriveguy@gmail.com diff --git a/gitScript1.sh b/gitScript1.sh index e69de29..33eac33 100644 --- a/gitScript1.sh +++ b/gitScript1.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +#1715630384 +git init +#1715630403 +git branch -m main +#1715630425 +git add helloworld.py +#1715630447 +git status +#1715630469 +git commit -m "Hello world" +#1715630489 +git config --global user.email "hyperdriveguy@gmail.com" +#1715630507 +git config --global user.name "Carson Bush" +#1715630530 +git commit -m "Hello World" +#1715630534 +git status +#1715630556 +git branch branch1 +#1715630560 +git branch +#1715630574 +git checkout branch1 +#1715630582 +git add git_check.py +#1715630596 +git commit -m "Git check time" +#1715630618 +git merge --help +#1715630664 +git checkout main +#1715630669 +git merge branch1 diff --git a/gitScript2.sh b/gitScript2.sh index e69de29..016bcf5 100644 --- a/gitScript2.sh +++ b/gitScript2.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#1715631549 +git clone https://github.com/BYUComputingBootCampTests/git-clone.git +#1715631562 +cd git-clone +#1715631568 +git log +#1715631866 +git diff e4c1d b1cab +#1715631945 +git restore -s b1cab door.py +#1715631963 +git add . +#1715631979 +git commit -m "Revert door to previous commit" diff --git a/repo2/git-clone b/repo2/git-clone new file mode 160000 index 0000000..1732ca8 --- /dev/null +++ b/repo2/git-clone @@ -0,0 +1 @@ +Subproject commit 1732ca8431898335652dcb27bd5ce690fa7be46b