Rockbox git branch

Making changes to your copy of the Rockbox Source:

So now you have a copy of the Rockbox source on your machine
I bet you are ready to add some patches and tweaks to really make it yours!

We're almost there but first lets make a new branch.
Whats is a branch it is a way to set a point in history that you can go back to.

At the moment your source tree is at master you can verify this by typing 'git branch'

instead of making changes to this master branch go ahead and create a sub branch for some testing
'git checkout -b myreallyawesomebranch'

Now master has been cloned to myreallyawesomebranch you can make your changes while still having
an original copy of master still waiting for you.

Once you have made your changes type 'git status' to see a list of the files you have changed
lets commit this to your local machine and checkout a new branch

When you type git add <filename> it stages the file for commit you need to do this for each of
the modified files you see in the git status list.

finally when you have all changes added type 'git commit'

type a message (blank messages will abort the commit)

Finally press '[CTRL]o' and then '[CTRL]x'

Yay you just made your first commit!!

Now type git checkout master and you are back at the Rockbox original source

It's a good idea to update your copy of the source tree every once in a while.
at the master branch type 'git pull --rebase'

Now lets checkout a new branch 'git checkout -b newtestbranch'
now you are on a new freshly updated branch where you can make more changes

But wait you say I just ran rebase on master does it update 'myreallyawesomebranch' too?

No for that you need to go to the branch and rebase it as well

Assuming you haven't made changes to newtestbranch (otherwise you'll need to commit the changes first)
 you can just type 'git checkout myreallyawesomebranch' and now type 'git rebase master' and now if at
all possible git will update 'myreallyawesomebranch' to the same place as master with your changes applied on top

(Note: git can't always figure out how to update to the latest master so it needs to be done by hand with little
 guidance from git or just abort the rebase).