Skip to content
matthew-parlette edited this page Jan 22, 2013 · 10 revisions

Descriptions and guides for the development of bitfl

Development Process

http://scottchacon.com/2011/08/31/github-flow.html

How To

Setup git remote

$ git remote <url from github>

Create new branch

$ git checkout -b feature_branch

$ git push origin feature_branch

Update local copy of all branches

$ git fetch -p

  • -p will 'prune', removing any local branch that does not exist on origin

Update a feature branch with latest master

$ git checkout feature_branch

$ git merge master

Revert a commit

If you make a mistake and commit a change to the wrong branch, you can revert any commit:

http://stackoverflow.com/questions/4114095/git-revert-to-previous-commit-how

Automatically push any commits

To do this, you will need to edit the hook script that is executed on post-commit.

From the bitfl dir:

$ nano .git/hooks/post-commit

This should likely be empty, add the following contents:

#!/bin/sh

# This script will execute after a commit is complete

# Automatically push the changes back to origin

git push

Clone this wiki locally