From 6af47d271e1339dc6ad16e31e628c8979cf10798 Mon Sep 17 00:00:00 2001 From: Luke Owncloud Date: Mon, 21 Oct 2013 11:40:20 +0200 Subject: [PATCH] fix git update instructions --- SETUP.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SETUP.md b/SETUP.md index 5b773813..cd67a800 100644 --- a/SETUP.md +++ b/SETUP.md @@ -8,7 +8,10 @@ - Clone your new repo: "git clone git@github.com:YOURGITHUBNAME/android.git" - "cd android" - Checkout remote develop branch: "git checkout -b develop remotes/origin/develop" - - Make sure to get the latest changes of android/develop branch: "git pull origin develop" + - Pull changes from your develop branch: "git pull origin develop" + - Make sure to get the latest changes from official android/develop branch: + - Make official owncloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git" + - Pull latest changes from upstream: "git pull upstream develop" 2. Building with console/maven: -- 2.11.0