You can follow the discussion on Git Merge vs. Rebase: Which to Use and When without having to leave a comment. Cool, huh? Just enter your email address in the form here below and you're all set.