From 9367ec468cd985029c4242a1e3903f1e2d3be9b9 Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Sun, 19 Sep 2021 22:37:16 -0400 Subject: [PATCH 01/13] Remove existing contributions --- contributors/maya-papaya1_contributed.txt.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 contributors/maya-papaya1_contributed.txt.txt diff --git a/contributors/maya-papaya1_contributed.txt.txt b/contributors/maya-papaya1_contributed.txt.txt deleted file mode 100644 index e69de29..0000000 From d58130134baf1bff02eb40fc3ca7f70b6e7cf9bd Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Mon, 20 Sep 2021 13:14:10 -0400 Subject: [PATCH 02/13] Replace not-stirred with rept-org --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3080371..9a9b26f 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,7 @@ It's just an example of the basic Git workflow described in [What is a Git Repos 1. Fork the repository - Go to this repository's [home page](https://github.com/not-stirred/learn-git) and on the upper right corner click `Fork`. + Go to this repository's [home page](https://github.com/rept-org/learn-git) and on the upper right corner click `Fork`. 2. Clone the repository @@ -282,7 +282,7 @@ It's just an example of the basic Git workflow described in [What is a Git Repos 7. Create a pull request - Now you have your own version of the learn-git repository, but you need to merge your changes from the head repository (your fork) to the base repository (not-stirred/learn-git). GitHub Desktop has a handy way to do this by just clicking `Create Pull Request`. Once you do so it will take you to the GitHub website, where you can title, describe, and file your PR. + Now you have your own version of the learn-git repository, but you need to merge your changes from the head repository (your fork) to the base repository ([rept-org/learn-git](https://github.com/rept-org/learn-git)). GitHub Desktop has a handy way to do this by just clicking `Create Pull Request`. Once you do so it will take you to the GitHub website, where you can title, describe, and file your PR. --- From a1b7effe3d6bda74668b2659adb6ac9a73deceb0 Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Mon, 20 Sep 2021 13:28:34 -0400 Subject: [PATCH 03/13] Add Github pages stuff --- contributors/example-contributor.html | 10 ++++++++++ index.html | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 contributors/example-contributor.html create mode 100644 index.html diff --git a/contributors/example-contributor.html b/contributors/example-contributor.html new file mode 100644 index 0000000..fa3f163 --- /dev/null +++ b/contributors/example-contributor.html @@ -0,0 +1,10 @@ + + + + +

Your Name Here

+ +

Your Message Here

+ + + diff --git a/index.html b/index.html new file mode 100644 index 0000000..fa3857c --- /dev/null +++ b/index.html @@ -0,0 +1,17 @@ + + + + +

Welcome to Learn Git the Easy Way

+ +

+ + To see a contributor file, go to https://rept-org.github.io/learn-git/contributors/<github username>. + +

+ + For an example see the example contributor. +

+ + + From dca6e6903a63d87b64a92e73dfa15d17b006010e Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Mon, 20 Sep 2021 13:49:23 -0400 Subject: [PATCH 04/13] Add tutorial html --- README.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a9b26f..91cd1b1 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,19 @@ It's just an example of the basic Git workflow described in [What is a Git Repos 4. Make your change - Create a new file called `-contributed.txt` in the `contributors` directory and add a message. + Create a new file called `.html` in the `contributors` directory. + + Add the following text to it and put in your name and message: + + ```html + + + +

Your Name Here

+

Your Message Here

+ + + ``` 5. Commit your change @@ -283,6 +295,8 @@ It's just an example of the basic Git workflow described in [What is a Git Repos 7. Create a pull request Now you have your own version of the learn-git repository, but you need to merge your changes from the head repository (your fork) to the base repository ([rept-org/learn-git](https://github.com/rept-org/learn-git)). GitHub Desktop has a handy way to do this by just clicking `Create Pull Request`. Once you do so it will take you to the GitHub website, where you can title, describe, and file your PR. + + When your PR is merged, check `https://rept-org.github.io/learn-git/contributors/`! --- From c2d2fff746d68ffec62c8b92a8b82f99d8317bf1 Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Mon, 20 Sep 2021 14:38:25 -0400 Subject: [PATCH 05/13] Update README.md --- README.md | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 91cd1b1..0f31792 100644 --- a/README.md +++ b/README.md @@ -226,38 +226,34 @@ It's just an example of the basic Git workflow described in [What is a Git Repos #### Steps -1. Fork the repository +1. Clone the repository - Go to this repository's [home page](https://github.com/rept-org/learn-git) and on the upper right corner click `Fork`. - -2. Clone the repository - - Clone this repository by selecting `URL` in the pop up window and entering `/learn-git`. + Clone this repository by selecting `URL` in the pop up window and entering `rept-org/learn-git`. ***or*** ```shell - git clone https://github.com//learn-git + git clone https://github.com/rept-org/learn-git ``` -3. Create a new branch +2. Create a new branch - Create a new branch named `` and select the option `Publish your branch`. + Create a new branch named `` and select the option `Publish your branch`. ***or*** ```shell # Option 1 - git branch - git checkout + git branch + git checkout # Option 2 - git checkout -b + git checkout -b ``` 4. Make your change - Create a new file called `.html` in the `contributors` directory. + Create a new file called `.html` in the `contributors` directory. Add the following text to it and put in your name and message: @@ -273,13 +269,13 @@ It's just an example of the basic Git workflow described in [What is a Git Repos 5. Commit your change - Now, on the left side of GitHub Desktop, you should see `1 changed file` above the path to the new file. Under that, title your commit, optionally add a description, and click `Commit to `. + Now, on the left side of GitHub Desktop, you should see `1 changed file` above the path to the new file. Under that, title your commit, optionally add a description, and click `Commit to `. ***or*** ```shell git add . - git commit -m "" + git commit -m "Add page" ``` 6. Push your change @@ -294,7 +290,7 @@ It's just an example of the basic Git workflow described in [What is a Git Repos 7. Create a pull request - Now you have your own version of the learn-git repository, but you need to merge your changes from the head repository (your fork) to the base repository ([rept-org/learn-git](https://github.com/rept-org/learn-git)). GitHub Desktop has a handy way to do this by just clicking `Create Pull Request`. Once you do so it will take you to the GitHub website, where you can title, describe, and file your PR. + Now you have your own version of the learn-git repository, but you need to merge your changes from your branch (``) to the base branch (`master`). GitHub Desktop has a handy way to do this by just clicking `Create Pull Request`. Once you do so it will take you to the GitHub website, where you can title, describe, and file your PR. When your PR is merged, check `https://rept-org.github.io/learn-git/contributors/`! From ee91d3a7dea97445ec925386ace1ec20ea95ca57 Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Mon, 20 Sep 2021 15:01:00 -0400 Subject: [PATCH 06/13] Remove markdown as detectable language --- .gitattributes | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index cc7c543..0000000 --- a/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -# Linguist overrides -*.md linguist-detectable -*.md linguist-documentation=false \ No newline at end of file From 1ece77ed779b47c83ca000d6eaa04e2f636865c9 Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Mon, 20 Sep 2021 20:05:59 -0400 Subject: [PATCH 07/13] Format HTML --- README.md | 5 +++++ contributors/example-contributor.html | 8 +++++--- index.html | 21 ++++++++++++--------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 0f31792..d6bd56e 100644 --- a/README.md +++ b/README.md @@ -260,10 +260,15 @@ It's just an example of the basic Git workflow described in [What is a Git Repos ```html + +

Your Name Here

+

Your Message Here

+ + ``` diff --git a/contributors/example-contributor.html b/contributors/example-contributor.html index fa3f163..1d50c1d 100644 --- a/contributors/example-contributor.html +++ b/contributors/example-contributor.html @@ -1,10 +1,12 @@ + -

Your Name Here

+

Your Name Here

-

Your Message Here

+

Your Message Here

- + + \ No newline at end of file diff --git a/index.html b/index.html index fa3857c..c00f4ad 100644 --- a/index.html +++ b/index.html @@ -1,17 +1,20 @@ + -

Welcome to Learn Git the Easy Way

+

Welcome to Learn Git the Easy Way

+ +

-

- - To see a contributor file, go to https://rept-org.github.io/learn-git/contributors/<github username>. + To see a contributor file, go to https://rept-org.github.io/learn-git/contributors/<github username>. -

- - For an example see the example contributor. -

+

+ + For an example see the example + contributor. +

- + + \ No newline at end of file From 95448cef24106d6a4adcb50c6cfe76873ce8d941 Mon Sep 17 00:00:00 2001 From: Gideon Shaked Date: Wed, 22 Sep 2021 14:34:10 -0400 Subject: [PATCH 08/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d6bd56e..b2ea793 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Learn Git the Easy Way -This is a simple, guided tutorial intended to be a simple introduction to Git. +This is a guided tutorial intended to be a simple introduction to Git. While other tutorials may concentrate on terminal commands and Git objects, this guide sticks to the basics. In this tutorial, we will go through an introduction to Git and version control, a breakdown of how to use Git, and a sample project with GitHub Desktop or the command line interface (CLI) to demonstrate practical usage of Git. If you have no experience, don't worry! This tutorial assumes no knowledge of the CLI or programming. Enjoy! From 2ea88a915292ef9bf2cb90ff78568eb5842758cb Mon Sep 17 00:00:00 2001 From: 23atshue <23atshue@ransomeverglades.org> Date: Wed, 22 Sep 2021 15:31:07 -0400 Subject: [PATCH 09/13] Create 23atshue.html --- contributors/23atshue.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 contributors/23atshue.html diff --git a/contributors/23atshue.html b/contributors/23atshue.html new file mode 100644 index 0000000..e69de29 From 5d01eacf5e1a1fe7d00915dbf60174828a83a591 Mon Sep 17 00:00:00 2001 From: 23atshue <23atshue@ransomeverglades.org> Date: Wed, 22 Sep 2021 15:32:08 -0400 Subject: [PATCH 10/13] Update 23atshue.html --- contributors/23atshue.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/contributors/23atshue.html b/contributors/23atshue.html index e69de29..fd0c58d 100644 --- a/contributors/23atshue.html +++ b/contributors/23atshue.html @@ -0,0 +1,12 @@ + + + + + +

Alexis

+ +

asdfasdfasdf

+ + + + From ea227ee8482cdce00cc2bdb003d9d9a87a3c40fb Mon Sep 17 00:00:00 2001 From: 23atshue <23atshue@ransomeverglades.org> Date: Wed, 22 Sep 2021 15:33:42 -0400 Subject: [PATCH 11/13] Update 23atshue.html --- contributors/23atshue.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/23atshue.html b/contributors/23atshue.html index fd0c58d..be5ceb4 100644 --- a/contributors/23atshue.html +++ b/contributors/23atshue.html @@ -5,7 +5,7 @@

Alexis

-

asdfasdfasdf

+

learning git

From bba0634acf3f064b16e676307ef64139e0dbae18 Mon Sep 17 00:00:00 2001 From: 23atshue <23atshue@ransomeverglades.org> Date: Wed, 22 Sep 2021 15:34:32 -0400 Subject: [PATCH 12/13] Add my new file --- contributors/23atshue.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/23atshue.html b/contributors/23atshue.html index be5ceb4..192a64c 100644 --- a/contributors/23atshue.html +++ b/contributors/23atshue.html @@ -5,7 +5,7 @@

Alexis

-

learning git

+

learning git yay

From 57d2caab1d2473b9e2906699676fcc26d1c1c5c4 Mon Sep 17 00:00:00 2001 From: 23atshue <23atshue@ransomeverglades.org> Date: Wed, 22 Sep 2021 15:35:57 -0400 Subject: [PATCH 13/13] Add new file --- contributors/23atshue.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/23atshue.html b/contributors/23atshue.html index 192a64c..c5d95af 100644 --- a/contributors/23atshue.html +++ b/contributors/23atshue.html @@ -5,7 +5,7 @@

Alexis

-

learning git yay

+

learning git yay!