title: Git Rebase from Remote Master
body: <p>This may have been asked before but I am a little confused on the terminology, so I am not sure what command(s) are the correct ones to accomplish what I need to accomplish.  Right now I have a GitHub repository I am working from with my team.  On there, I made a branch for a task.  I cloned the repository to my local machine and then checked out that branch locally.  I started making changes that I wish to continue working on...  While making these changes, my team has been updating their code and pushing changes back into the master branch on GitHub.  How do I pull down their changes from the master branch on GitHub so that it updates my branch locally AND on GitHub as well (Right now on GitHub, it says I am 1 commit ahead and 19 commits behind master).  Thanks for the advice here...this will be something I plan to do regularly so learning the right process would be instrumental for me...</p>