xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file docs/source/developers/github/create_branches.rst

Browse Source
This commit is contained in:
GONG Jie 2017-12-31 23:59:59 +00:00
parent e5416b7a85
commit c6de0b40d7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/source/developers/github/create_branches.rst
View File

@ -6,14 +6,14 @@ Creating Branches
Local Branches
--------------
Git branches are very light weight and easy to create. Simply use the ``git branch <branch_name>`` command.
Git branches are very light weight and easy to create. Simply use the ``git branch <branch_name>`` 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