local branch creation

First, you must create your branch locally. Create a branch for every feature you work on.

git checkout -b your_branch

basic git workflow

git add .
git commit -m "message"
git status

Initial push back up to github repo

After that, you can work locally in your branch, when you are ready to share the branch, push it. The next command push the branch to the remote repository origin and tracks it. git push -u origin your_branch

teammates can play too!

Teammates can reach your branch, by doing:

git pull
git checkout origin/your_branch

push existing branches (after initial commit)

You can continue working in the branch and pushing whenever you want without passing arguments to git push (argumentless git push will push the master to remote master, your_branch local to remote your_branch, etc...)

git push

Teammates can push to your branch by doing commits and then push explicitly.

#When you want new code from another branch#

git rebase

To pull down the latest changes from the a branch to you local feature branch, you must merge the branch with your local feature branch.

git checkout your_branch 
git merge branch_with_desired_code

#Careful: don't merge master locally#

BAD: git checkout master BAD: git merge your_branch BAD: git push

Basically we don't want stuff committed to the master branch from a local repo. We want to use pull requests through git hub to commit production code.

#finalize to production code#

Push your branch up, then goto github and open a pull request between your code and the master branch. Then ask a backend guy to review the code and close the pull.

reset the origin:

git remote set-url origin <url>

#A basic workflow#

... work ... git commit ... work ... git commit git push origin HEAD:refs/heads/your_branch Or tracking the branch to avoid the arguments to git push

git checkout --track -b your_branch origin/your_branch ... work ... git commit ... work ... git commit git push