Skip to content

Instantly share code, notes, and snippets.

@matthewmccullough

matthewmccullough/github-office-hours-notes-2012-08-06.md

Created August 6, 2012 18:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save matthewmccullough/3277314 to your computer and use it in GitHub Desktop.
Save matthewmccullough/3277314 to your computer and use it in GitHub Desktop.
Download ZIP
GitHub Office Hours Notes from 2012-08-06
Raw
github-office-hours-notes-2012-08-06.md
  • Differences and benefits of merging versus rebase
  • Rebase
    • Reshaping history
    • Clearer for the next users
  • Preparing for merging feature1 into master
  • Rebase feature
    • Combine commits (2 into 1)
    • Reorder commits (javascript early in the series, the html last)
    • Remove commits
  • Rebase (2 flavors)
    • Basic
    • Interactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment