Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D4C1C18CC0 for ; Mon, 16 Nov 2015 07:17:28 +0000 (UTC) Received: (qmail 71248 invoked by uid 500); 16 Nov 2015 07:17:28 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71167 invoked by uid 500); 16 Nov 2015 07:17:28 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 71146 invoked by uid 99); 16 Nov 2015 07:17:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Nov 2015 07:17:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BAC7DFCC9; Mon, 16 Nov 2015 07:17:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Mon, 16 Nov 2015 07:17:28 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cloudstack-docs git commit: Based on my conversation with the user terbolous in #cloudstack: Changed the sequence of operations in the section "Initial setup of your fork" to move the two commands related to the upstream repository together. Repository: cloudstack-docs Updated Branches: refs/heads/master 82119f92f -> b374cfae9 Based on my conversation with the user terbolous in #cloudstack: Changed the sequence of operations in the section "Initial setup of your fork" to move the two commands related to the upstream repository together. Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/394388bb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/394388bb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/394388bb Branch: refs/heads/master Commit: 394388bb47469de416c00cfe7cfa1cf599b238d6 Parents: 82119f9 Author: Eric Pretorious Authored: Fri Oct 23 06:27:28 2015 -0700 Committer: Eric Pretorious Committed: Fri Oct 23 06:27:28 2015 -0700 ---------------------------------------------------------------------- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/394388bb/README.rst ---------------------------------------------------------------------- diff --git a/README.rst b/README.rst index cbd6b54..619e9dd 100644 --- a/README.rst +++ b/README.rst @@ -50,8 +50,8 @@ On your computer, follow these steps to setup a local repository for working on $ git clone https://github.com/YOUR_ACCOUNT/cloudstack-docs.git $ cd cloudstack-docs $ git remote add upstream https://github.com/apache/cloudstack-docs.git - $ git checkout master $ git fetch upstream + $ git checkout master $ git merge upstream/master