aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEiner von Vielen <tomwie@users.sourceforge.net>2015-01-06 19:07:59 +0100
committerEiner von Vielen <tomwie@users.sourceforge.net>2015-01-06 19:07:59 +0100
commit88d26f1f8716ce1a9c59aae56f78e6a7d0ec8ad1 (patch)
tree465792f8e07bbb7d9837416508446ff4e3c20167
parent94dd994abcf9a845374305693dcc70e99614b216 (diff)
downloadvolse-hubzilla-88d26f1f8716ce1a9c59aae56f78e6a7d0ec8ad1.tar.gz
volse-hubzilla-88d26f1f8716ce1a9c59aae56f78e6a7d0ec8ad1.tar.bz2
volse-hubzilla-88d26f1f8716ce1a9c59aae56f78e6a7d0ec8ad1.zip
Corrected errors in chapter 'Contribute your changes via github'
- changed commit statement - changed push statement (it pointed to the orign)
-rw-r--r--doc/dev_beginner.bb15
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb
index 4fc0fe455..c00cafb9d 100644
--- a/doc/dev_beginner.bb
+++ b/doc/dev_beginner.bb
@@ -347,6 +347,11 @@ surfer@debian:/var/www$ git config --global user.name "Your Name"
surfer@debian:/var/www$ git config --global user.email "your@mail.com"
[/code]
+Create a descriptive topic branch
+[code]
+surfer@debian:/var/www$ git checkout -b dev_beginning
+[/code]
+
Make sure your local repository is up-to-date with the main project.
Add the original repository as a remote named “upstream” if not done yet
[code]
@@ -356,11 +361,7 @@ surfer@debian:/var/www$ git remote add upstream https://github.com/friendica/red
Fetch the newest work from that remote
[code]
surfer@debian:/var/www$ git fetch upstream
-[/code]
-
-Create a descriptive topic branch
-[code]
-surfer@debian:/var/www$ git checkout -b dev_beginning
+surfer@debian:/var/www$ git merge upstream/master
[/code]
Hint: You can list the branches
@@ -382,12 +383,12 @@ surfer@debian:/var/www$ git add doc/dev_beginner.bb
Commit the changes to your local branch. This will open an editor to provide a message.
[code]
-surfer@debian:/var/www$ git commit
+surfer@debian:/var/www$ git commit -a
[/code]
Push back up to the same topic branch online
[code]
-surfer@debian:/var/www$ git push origin dev_beginning
+surfer@debian:/var/www$ git push
[/code]
Now you can go to your (online) account at github and create the pull request.