From 74f9a6e98a4be93076beeafe2d9a91be6434e928 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 13 Jan 2012 17:34:16 +0100 Subject: [PATCH] create working branch Signed-off-by: Nico Schottelius --- doc/man/man7/cdist-bootstrap.text | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/man/man7/cdist-bootstrap.text b/doc/man/man7/cdist-bootstrap.text index 45bd7907..c6f91ac3 100644 --- a/doc/man/man7/cdist-bootstrap.text +++ b/doc/man/man7/cdist-bootstrap.text @@ -32,8 +32,8 @@ For more sophisticated setups developing cdist configurations with multiple people, have a look at cdist-best-practice(7). -SETUP WORKING DIRECTORY ------------------------ +SETUP WORKING DIRECTORY AND BRANCH +---------------------------------- I assume you have a fresh copy of the cdist tree in ~/cdist, cloned from one of the official urls (see cdist-quickstart(7) if you don't). Entering the command "git branch" should show you "* master", which indicates @@ -77,15 +77,18 @@ ethz-systems, localch, customerX, ... But this is pretty much up to you. In this tutorial I use the branch **mycompany**: - -------------------------------------------------------------------------------- - +cdist% git checkout -b mycompany origin/master +Branch mycompany set up to track remote branch master from origin. +Switched to a new branch 'mycompany' +cdist-user% git branch + master +* mycompany -------------------------------------------------------------------------------- - own account / server, one/multiple users clone