diff options
| author | Luke Yeager <lukeyeager@users.noreply.github.com> | 2015-06-16 09:12:32 -0700 |
|---|---|---|
| committer | Luke Yeager <lukeyeager@users.noreply.github.com> | 2015-06-16 09:12:32 -0700 |
| commit | 94a5be14cb7775ba0567348631baa6d595ddf568 (patch) | |
| tree | 370b81c531c9df656f159fc2e8289ff767837b6f /docs | |
| parent | 0d7c6cb4b2286980c3d5b47cfddb2457202c93cf (diff) | |
| download | caffeonacl-94a5be14cb7775ba0567348631baa6d595ddf568.tar.gz caffeonacl-94a5be14cb7775ba0567348631baa6d595ddf568.tar.bz2 caffeonacl-94a5be14cb7775ba0567348631baa6d595ddf568.zip | |
Fix HTML display for docs
Doesn't change display in Markdown
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/development.md | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/docs/development.md b/docs/development.md index ccb6a297..107c2c3b 100644 --- a/docs/development.md +++ b/docs/development.md @@ -62,28 +62,25 @@ The following is a poetic presentation of the protocol in code form. #### [Shelhamer's](https://github.com/shelhamer) “life of a branch in four acts” Make the `feature` branch off of the latest `bvlc/master` -``` -git checkout master -git pull upstream master -git checkout -b feature -# do your work, make commits -``` + + git checkout master + git pull upstream master + git checkout -b feature + # do your work, make commits Prepare to merge by rebasing your branch on the latest `bvlc/master` -``` -# make sure master is fresh -git checkout master -git pull upstream master -# rebase your branch on the tip of master -git checkout feature -git rebase master -``` + + # make sure master is fresh + git checkout master + git pull upstream master + # rebase your branch on the tip of master + git checkout feature + git rebase master Push your branch to pull request it into `BVLC/caffe:master` -``` -git push origin feature -# ...make pull request to master... -``` + + git push origin feature + # ...make pull request to master... Now make a pull request! You can do this from the command line (`git pull-request -b master`) if you install [hub](https://github.com/github/hub). Hub has many other magical uses. |