gc my-branch # always work on a local branch
gca "some commit message" # commit early, commit often
gfom && grom; # fetch and merge often
gca "some commit message" # last commit before merge
git rebase -i origin/master # interactive rebase to squash commits and make nice commit log
gc master # checkout master
git merge my-branch
gpom # git push origin master
Created
December 21, 2009 09:35
-
-
Save glennr/260876 to your computer and use it in GitHub Desktop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment