Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alexis #2

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
3 changes: 0 additions & 3 deletions .gitattributes

This file was deleted.

49 changes: 32 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -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!
Expand Down Expand Up @@ -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 `<mygithubusername>/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/<mygithubusername>/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 `<mygithubusernamename-contributed>` and select the option `Publish your branch`.
Create a new branch named `<my github username>` and select the option `Publish your branch`.

***or***

```shell
# Option 1
git branch <mygithubusername-contributed>
git checkout <mygithubusername-contributed>
git branch <my github username>
git checkout <my github username>

# Option 2
git checkout -b <mygithubusername-contributed>
git checkout -b <my github username>
```

4. Make your change

Create a new file called `<mygithubusername>-contributed.txt` in the `contributors` directory and add a message.
Create a new file called `<my github username>.html` in the `contributors` directory.

Add the following text to it and put in your name and message:

```html
<!DOCTYPE html>
<html>

<body>

<h1>Your Name Here</h1>

<p>Your Message Here</p>

</body>

</html>
```

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 <mygithubusername-contributed>`.
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 <my github username>`.

***or***

```shell
git add .
git commit -m "<your commit title>"
git commit -m "Add <my github username> page"
```

6. Push your change
Expand All @@ -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 (`<my github username>`) 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/<mygithubusername>`!

---

Expand Down
12 changes: 12 additions & 0 deletions contributors/23atshue.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>

<body>

<h1>Alexis</h1>

<p>learning git yay!</p>

</body>

</html>
12 changes: 12 additions & 0 deletions contributors/example-contributor.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>

<body>

<h1>Your Name Here</h1>

<p>Your Message Here</p>

</body>

</html>
Empty file.
20 changes: 20 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>

<body>

<h1>Welcome to Learn Git the Easy Way</h1>

<p>

To see a contributor file, go to https://rept-org.github.io/learn-git/contributors/&#60;github username&#62;.

<br /><br />

For an example see <a href="https://rept-org.github.io/learn-git/contributors/example-contributor">the example
contributor</a>.
</p>

</body>

</html>