David Walden

Cheat Sheet

April 4, 2016

Git Workflow

Navigate to master branch.

Update master branch from remote master branch.

              git pull origin master
            

Create a new feature branch.

              git checkout -b branch_name
            

Make your changes.

Stage your changes for commit.

              git add file_name
            

Save changes.

              git commit -m "commit message"
            

Send changes to GitHub.

              git push origin branch_name
            

Merge changes on GitHub

Checkout master branch.

              git checkout master
            

Update local master branch.

              git pull origin master
            

Confirm that the local repository has been properly updated and the changes have been saved.

Delete the old feature branch.

              git branch -d branch_name