From 0e4248cdea11786ddd9f628dc5fb22a30f083757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Wed, 4 Jan 2017 16:32:43 +0100 Subject: [PATCH 1/4] Created a readme with some basic informations --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..70bc2fa2 --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# VocaluxeWebsite +This branch contains our GitHub-Page. It's accessible via https://vocaluxe.github.io and based on Jekyll, a popular static site generator. + +##Working on this website +For easier working this website and don't mess around with all other branches, we suggest to clone this as a single-branch. Just follow these steps: + +1. Clone only `gh-pages` branch: `git clone git@github.com:Vocaluxe/Vocaluxe.git -b gh-pages --single-branch VocaluxeWeb` +2. Rename remote: `git remote rename origin upstream` +3. Add your forked Vocaluxe repository as remote: `git remote add origin git@github.com:USERNAME/Vocaluxe.git` +4. Push `gh-pages` to your repository: `git push origin gh-pages` + +Your now able to make some changes, create commits and open pull-request. + +##Opening issues and pull-request +We're happy when you have some ideas or find bugs on our website. Please add the `website`-label when opening a new issue or pullrequest. From b80805f3533f6e06cb87242422adc85737dfaac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Wed, 4 Jan 2017 16:39:00 +0100 Subject: [PATCH 2/4] Some more work on readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 70bc2fa2..b38a4311 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,9 @@ For easier working this website and don't mess around with all other branches, w 2. Rename remote: `git remote rename origin upstream` 3. Add your forked Vocaluxe repository as remote: `git remote add origin git@github.com:USERNAME/Vocaluxe.git` 4. Push `gh-pages` to your repository: `git push origin gh-pages` +5. Checkout your `gh-pages` branch: `git checkout origin/gh-pages` -Your now able to make some changes, create commits and open pull-request. +Your now able to make some changes, create commits and open pull-request. When pulling or pushing some changes, we recommand to specify your pull. Otherwise you would download the whole vocaluxe project and waste some space. `git pull origin gh-pages` for pulling your own changes. ##Opening issues and pull-request We're happy when you have some ideas or find bugs on our website. Please add the `website`-label when opening a new issue or pullrequest. From e4b5b49b78869e7758997055668131aa4c458932 Mon Sep 17 00:00:00 2001 From: lukeIam Date: Fri, 6 Jan 2017 20:24:43 +0100 Subject: [PATCH 3/4] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b38a4311..7aee9a80 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ For easier working this website and don't mess around with all other branches, w 4. Push `gh-pages` to your repository: `git push origin gh-pages` 5. Checkout your `gh-pages` branch: `git checkout origin/gh-pages` -Your now able to make some changes, create commits and open pull-request. When pulling or pushing some changes, we recommand to specify your pull. Otherwise you would download the whole vocaluxe project and waste some space. `git pull origin gh-pages` for pulling your own changes. +Your now able to make some changes, create commits and open pull-request. When pulling or pushing some changes, we recommend to specify your pull. Otherwise you would download the whole Vocaluxe project and waste some space. `git pull origin gh-pages` for pulling your own changes. -##Opening issues and pull-request -We're happy when you have some ideas or find bugs on our website. Please add the `website`-label when opening a new issue or pullrequest. +##Opening issues and pull requests +We're happy when you have some ideas or find bugs on our website. Please add the `website`-label when opening a new issue or pull request. From a5d1f1537126b801b3998690ad7b44800260fc61 Mon Sep 17 00:00:00 2001 From: lukeIam Date: Fri, 6 Jan 2017 23:02:56 +0100 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7aee9a80..c830341f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ For easier working this website and don't mess around with all other branches, w 4. Push `gh-pages` to your repository: `git push origin gh-pages` 5. Checkout your `gh-pages` branch: `git checkout origin/gh-pages` -Your now able to make some changes, create commits and open pull-request. When pulling or pushing some changes, we recommend to specify your pull. Otherwise you would download the whole Vocaluxe project and waste some space. `git pull origin gh-pages` for pulling your own changes. +Your now able to make some changes, create commits and open pull-request. When pulling or pushing some changes, we recommend to specify your branch. Otherwise you would download the whole Vocaluxe project and waste some space. `git pull origin gh-pages` for pulling your own changes. ##Opening issues and pull requests We're happy when you have some ideas or find bugs on our website. Please add the `website`-label when opening a new issue or pull request.