From a41f4c0522aa29b979f4a253591343e52a5895bc Mon Sep 17 00:00:00 2001
From: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>
Date: Thu, 6 Feb 2020 12:38:09 -0700
Subject: [PATCH 01/19] Updated README.md

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 5fc2b58..4d6cc66 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,10 @@
 # git-essentials
+
+## Deployment notes 
+Lorem ipsum dolor sit amet, consectetur adipisicing elit. Veniam laboriosam consequatur saepe. Repellat itaque dolores neque, impedit reprehenderit eum culpa voluptates harum sapiente nesciunt ratione.
+
+## Staging notes 
+Lorem ipsum dolor sit amet, consectetur adipisicing elit. Veniam laboriosam consequatur saepe. Repellat itaque dolores neque, impedit reprehenderit eum culpa voluptates harum sapiente nesciunt ratione.
+
+## How to use this repo notes 
+Lorem ipsum dolor sit amet, consectetur adipisicing elit. Veniam laboriosam consequatur saepe. Repellat itaque dolores neque, impedit reprehenderit eum culpa voluptates harum sapiente nesciunt ratione.

From 6d074db7d17d28c370bba9ebd363dcfd78872cb9 Mon Sep 17 00:00:00 2001
From: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>
Date: Thu, 6 Feb 2020 12:40:56 -0700
Subject: [PATCH 02/19] Update new-branch-file.txt

---
 new-branch-file.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/new-branch-file.txt b/new-branch-file.txt
index 9400ead..f44d50b 100644
--- a/new-branch-file.txt
+++ b/new-branch-file.txt
@@ -1 +1 @@
-New branch file only shows up in the new branch
+New branch file shows up in master and new-branch

From 1c72a8747429ca1e0295c0a3057e068ea063f69e Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Thu, 6 Feb 2020 19:42:00 +0000
Subject: [PATCH 03/19] Added a new empty file

---
 empty-file.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 empty-file.txt

diff --git a/empty-file.txt b/empty-file.txt
new file mode 100644
index 0000000..e69de29

From 09072eb0db7ff4112fe6e24cdddf0636b0787dbc Mon Sep 17 00:00:00 2001
From: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>
Date: Thu, 6 Feb 2020 12:49:37 -0700
Subject: [PATCH 04/19] Updated the empty file to not be empty anymore

---
 empty-file.txt    | 0
 not-empty-file.md | 3 +++
 2 files changed, 3 insertions(+)
 delete mode 100644 empty-file.txt
 create mode 100644 not-empty-file.md

diff --git a/empty-file.txt b/empty-file.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/not-empty-file.md b/not-empty-file.md
new file mode 100644
index 0000000..8de781b
--- /dev/null
+++ b/not-empty-file.md
@@ -0,0 +1,3 @@
+# This is not an empty file 
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eveniet numquam asperiores, dolore! Animi, veritatis maiores. Vel magni dolorum, vitae eum ut culpa unde autem blanditiis voluptatibus tenetur deleniti suscipit officiis non molestias nam reiciendis. Corporis cupiditate non sapiente inventore, illum eum aperiam, veniam numquam adipisci nisi. Necessitatibus, sint aliquid iusto.

From a85c55d61a4d1978f715477d41309fde9e2d0603 Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Thu, 6 Feb 2020 20:04:40 +0000
Subject: [PATCH 05/19] Timewarp

---
 timewarp.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 timewarp.txt

diff --git a/timewarp.txt b/timewarp.txt
new file mode 100644
index 0000000..e69de29

From b188e91f2447a9d6a00871bdffad7c4543383eeb Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Thu, 6 Feb 2020 21:47:39 +0000
Subject: [PATCH 06/19] Readme update commit

---
 README.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 4d6cc66..45e91cf 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,3 @@
 # git-essentials
 
-## Deployment notes 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit. Veniam laboriosam consequatur saepe. Repellat itaque dolores neque, impedit reprehenderit eum culpa voluptates harum sapiente nesciunt ratione.
-
-## Staging notes 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit. Veniam laboriosam consequatur saepe. Repellat itaque dolores neque, impedit reprehenderit eum culpa voluptates harum sapiente nesciunt ratione.
-
-## How to use this repo notes 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit. Veniam laboriosam consequatur saepe. Repellat itaque dolores neque, impedit reprehenderit eum culpa voluptates harum sapiente nesciunt ratione.
+Some new stuff in here 

From d0eabedb64310497a04e0ebccb59c4d5043fe531 Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Thu, 6 Feb 2020 21:52:18 +0000
Subject: [PATCH 07/19] Added a gitignore file

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..54520d1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.todo 
+.DS_Store 
+*.jpg 
+*.jpeg 

From f356af60a29dbc51675094875dee260bf359d8eb Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Thu, 6 Feb 2020 21:57:38 +0000
Subject: [PATCH 08/19] A typo here (typo in commit message was fixed)

---
 bad-commit-message.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bad-commit-message.txt

diff --git a/bad-commit-message.txt b/bad-commit-message.txt
new file mode 100644
index 0000000..e69de29

From cadf4533d0c78eebfdc2e419de020edbc2710434 Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Fri, 7 Feb 2020 15:50:47 +0000
Subject: [PATCH 09/19] Sample rebase

---
 rebase-file.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 rebase-file.txt

diff --git a/rebase-file.txt b/rebase-file.txt
new file mode 100644
index 0000000..e69de29

From dce7439105f217a5d41ac89e69aaa6fdeac86e74 Mon Sep 17 00:00:00 2001
From: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>
Date: Fri, 7 Feb 2020 09:15:42 -0700
Subject: [PATCH 10/19] Added merge conflict file

---
 merge-conflict.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 merge-conflict.txt

diff --git a/merge-conflict.txt b/merge-conflict.txt
new file mode 100644
index 0000000..68a1560
--- /dev/null
+++ b/merge-conflict.txt
@@ -0,0 +1,5 @@
+line 1 by github
+line 2 by github
+line 3 by github
+line 4 by github
+line 5 by github

From 6f171238189201cc5f255cb9534e5cc3e141c15e Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Fri, 7 Feb 2020 16:16:49 +0000
Subject: [PATCH 11/19] Merge conflict file added locally

---
 merge-conflict.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 merge-conflict.txt

diff --git a/merge-conflict.txt b/merge-conflict.txt
new file mode 100644
index 0000000..a2d05ed
--- /dev/null
+++ b/merge-conflict.txt
@@ -0,0 +1,5 @@
+line 1 by github
+line 2 by github
+line three by github (edited locally)
+line 4 by github
+line 5 by github

From ffe84f0d756c79e5188745421b5ac0d7faa228de Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Fri, 7 Feb 2020 16:25:19 +0000
Subject: [PATCH 12/19] Rebase conflict file from a branch

---
 rebase-conflict.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 rebase-conflict.txt

diff --git a/rebase-conflict.txt b/rebase-conflict.txt
new file mode 100644
index 0000000..6590d38
--- /dev/null
+++ b/rebase-conflict.txt
@@ -0,0 +1,5 @@
+line 1 by github
+line 2 by github
+line three by github
+line 4 by github
+line five by github

From 511c0e14c8c2a15ec71c60b39f1929783f16ff49 Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Fri, 7 Feb 2020 16:23:41 +0000
Subject: [PATCH 13/19] Rebase conflict example

---
 rebase-conflict.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rebase-conflict.txt b/rebase-conflict.txt
index 6590d38..226738a 100644
--- a/rebase-conflict.txt
+++ b/rebase-conflict.txt
@@ -3,3 +3,4 @@ line 2 by github
 line three by github
 line 4 by github
 line five by github
+(not from github this is from local)

From edb635788a031382bc536cabd4d51d925c497eaf Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Fri, 7 Feb 2020 16:42:58 +0000
Subject: [PATCH 14/19] Worked on rush task

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 45e91cf..3c57aab 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # git-essentials
 
-Some new stuff in here 
+To say something else (master branch)

From e19519fc2743ca86c04644c095a72f531b9972cc Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Fri, 7 Feb 2020 17:03:45 +0000
Subject: [PATCH 15/19] Updated readme

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3c57aab..57529ac 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
-# git-essentials
+# Git Essentials / Git For Everybody 
 
-To say something else (master branch)
+> This is a course to teach you how to use everyday git. 
+
+Course created by Kalob Taulien

From d5aa49331211bdd2c75e0e5ab6c28eeb812cf1ac Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Sun, 16 Feb 2020 14:19:24 -0700
Subject: [PATCH 16/19] Updated README.md

---
 README.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 57529ac..445189c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,49 @@
-# Git Essentials / Git For Everybody 
+# Git Essentials / Git For Everybody
+Visit [gitforeverybody.com](https://gitforeverybody.com/) for free tutorials and the full course.
 
-> This is a course to teach you how to use everyday git. 
+> This is a course to teach you how to use everyday git.
 
-Course created by Kalob Taulien
+
+## Contributing
+Welcome to my example Git Essentials repo! If you're here from the course, you have a few options:
+
+1. Clone this repo to download all the code you see here (but you can't make changes and overwrite my code)
+2. Fork this repo to add all this code to your GitHub profile _and then_ clone this repository from your account. Then you can make file changes and `git push` them to your forked version of this repo.
+3. Open a GitHub issue! Feel free to open an issue and explore.
+4. Once you've forked this repo and made some changes, you can open a pull request to merge your code into my repo here. Feel free to experiment with that until you feel confident opening a pull request.
+
+If you decide to open a pull request and add some work to this repo, I ask that you keep it simple. You can add a new file or update this README.md file with your name in the contributors list at the bottom, but please don't make changes to the original files from the course.
+
+## Where to get this course:
+- [x] [Git for Everybody.com](https://gitforeverybody.com/git-essentials/)
+- [ ] Skillshare (coming soon!)
+
+## Docker (advanced devs only)
+If you want a completely new and clean environment to start learning git form scratch, you can use a Docker container. That's what I did for this course. Below are the steps to reproduce the same setup I used in the Git Essentials course:
+
+```bash
+git clone git@github.com:KalobTaulien/git-essentials.git
+cd git-esentials
+docker build -t git .
+docker run -itd --hostname "gitforeverybody.com" --name "gitforeverybody.com" git
+docker container ls -a
+docker exec -it <container_id> bash
+
+# Once inside your Docker container, run these commands:
+apt update
+apt install vim nano git
+export PS1="\[$(tput setaf 6)\]kalob\[$(tput setaf 2)\]@\[$(tput setaf 3)\]gitforeverybody.com: \[$(tput sgr0)\]"
+export TERM=xterm-256color
+
+# Now you can run git commands as if you were on a brand new computer. You'll need to generate an SSH key and add it to GitHub.
+```
+
+## Contibutors
+If you're opening a pull request against this repo, you should put your name (and website, optional) in the list below!
+
+* Kalob Taulien [(website)](https://gitforeverybody.com/)
+* _Insert your name and website here_
+
+___
+
+Course created by Kalob Taulien.

From 1eab69e8c07941c5484930d23d8e38ae69f1a7dd Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Sun, 16 Feb 2020 14:19:43 -0700
Subject: [PATCH 17/19] Added Dockerfile to duplicate my setup in the videos

---
 Dockerfile | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..10537e1
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+FROM ubuntu:18.04
+
+RUN apt update
+RUN apt install vim nano git -y
+ENV TERM=xterm-256color
+CMD ["bash", "-l"]

From 8763632f5bf2f2ad711f175845a4f66ab888f94a Mon Sep 17 00:00:00 2001
From: Kalob Taulien <kalob.taulien@gmail.com>
Date: Tue, 10 Mar 2020 08:14:48 +0000
Subject: [PATCH 18/19] Udemy and Skillshare links

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 445189c..9e40715 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ If you decide to open a pull request and add some work to this repo, I ask that
 
 ## Where to get this course:
 - [x] [Git for Everybody.com](https://gitforeverybody.com/git-essentials/)
-- [ ] Skillshare (coming soon!)
+- [x] [Git Essentials on Skillshare.com](https://skl.sh/2viPzB9)
+- [x] [Git Essentials on Udemy.com](https://www.udemy.com/course/git-and-github-tutorial/?referralCode=91132F334DCD0CCAA250)
 
 ## Docker (advanced devs only)
 If you want a completely new and clean environment to start learning git form scratch, you can use a Docker container. That's what I did for this course. Below are the steps to reproduce the same setup I used in the Git Essentials course:

From cbc1fcd11c4202b79db1fb4720186f39b31004ad Mon Sep 17 00:00:00 2001
From: Matthew Bentivegna <mattb@cpcamps.com>
Date: Fri, 15 Aug 2025 20:03:48 -0400
Subject: [PATCH 19/19] added new txt file

---
 new-file.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 new-file.txt

diff --git a/new-file.txt b/new-file.txt
new file mode 100644
index 0000000..00a5d20
--- /dev/null
+++ b/new-file.txt
@@ -0,0 +1 @@
+Created a new file in this fork!