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 diff --git a/README.md b/README.md index 3080371..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! @@ -226,48 +226,61 @@ 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/not-stirred/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 `-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 - 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 @@ -282,7 +295,9 @@ 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 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/`! --- diff --git a/contributors/23atshue.html b/contributors/23atshue.html new file mode 100644 index 0000000..c5d95af --- /dev/null +++ b/contributors/23atshue.html @@ -0,0 +1,12 @@ + + + + + +

Alexis

+ +

learning git yay!

+ + + + diff --git a/contributors/example-contributor.html b/contributors/example-contributor.html new file mode 100644 index 0000000..1d50c1d --- /dev/null +++ b/contributors/example-contributor.html @@ -0,0 +1,12 @@ + + + + + +

Your Name Here

+ +

Your Message Here

+ + + + \ No newline at end of file diff --git a/contributors/maya-papaya1_contributed.txt.txt b/contributors/maya-papaya1_contributed.txt.txt deleted file mode 100644 index e69de29..0000000 diff --git a/index.html b/index.html new file mode 100644 index 0000000..c00f4ad --- /dev/null +++ b/index.html @@ -0,0 +1,20 @@ + + + + + +

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. +

+ + + + \ No newline at end of file