Skip to content

Instantly share code, notes, and snippets.

@glennr
Created December 21, 2009 09:35
Show Gist options
  • Select an option

  • Save glennr/260876 to your computer and use it in GitHub Desktop.

Select an option

Save glennr/260876 to your computer and use it in GitHub Desktop.
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment