diff --git a/docs/source/developers/github/create_branches.rst b/docs/source/developers/github/create_branches.rst index 48227ea9a..a69093e8e 100644 --- a/docs/source/developers/github/create_branches.rst +++ b/docs/source/developers/github/create_branches.rst @@ -6,14 +6,14 @@ Creating Branches Local Branches -------------- -Git branches are very light weight and easy to create. Simply use the ``git branch `` command. +Git branches are very light weight and easy to create. Simply use the ``git branch `` command. Since we are using pull requests to merge changes back to the upstream project, you will need to have your changes committed to a branch on GitHub (calling this a "remote branch") so that GitHub can detect differences and pull requests can be created. Remote Branches --------------- -Reference articles: +Reference articles: * http://www.gitguys.com/topics/adding-and-removing-remote-branches/ @@ -31,7 +31,7 @@ From GitHub * Since we created the branch from the UI, a refresh needs to be done in order to see the new branch. Refresh by fetching from the origin repository: :: $ git fetch origin - Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': + Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': From github.com:whowutwut/xcat-doc * [new branch] DOC_MERGE -> origin/DOC_MERGE @@ -54,25 +54,25 @@ From Command Line (CLI) $ git branch * master - $ git branch skeleton + $ git branch skeleton - $ git branch + $ git branch * master skeleton * Push the newly created branch to origin (on GitHub): :: - $ git push origin skeleton - Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': + $ git push origin skeleton + Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': Total 0 (delta 0), reused 0 (delta 0) To git@github.com:whowutwut/xcat-doc.git * [new branch] skeleton -> skeleton - Verify that the branch is there by looking at the remote branches: :: + Verify that the branch is there by looking at the remote branches: :: $ git branch -r origin/HEAD -> origin/master origin/master - origin/skeleton <=== HERE IT IS + origin/skeleton <=== HERE IT IS upstream/master