Version Control

Git & Github

• Git Tutorials
  • Git Official Docs
  • Atlassian's Git Tutorials
  • Visual Git Guide
  • A Successful Branching Model
• Github
  • Use Github's issue tracker, so you can refer to issues in your commit messages using # followed by issue no.
  • Working in a team? Use Github's Pull Request so you can do code review.
  • Github Cheatsheet
• GUI
  • Using git with command line is generally fast but using SourceTree is easier for reviewing your code before committing or committing a part of your changes and reduce chances that you will run a wrong command (such as push wrong branch to master).
  • GitX is a simple GUI that can also be started from the command line.

FAQs & Tips

• Atomic Commit is a good practice

• Stash is useful when you have unfinished messy things and need to switch branches to work on something else.

• Interactive Rebase is useful for making your commit logs cleaner.

• Need to merge multiple repos (e.g. using datavore in another project)? Use git subtree and DO NOT use git submodule.

Three ways to merge a pull request

• Github's merge squash = git rebase -i master and squash all commits + push result to master

• Github merge = git checkout master && git merge <branch> —no-ff

• If you want linear history without squashing, manually do git checkout master && git merge <branch> (without —no-ff) would make the result linear too.