how to get changes from master to your branch code example

Example 1: git update branch from master

git checkout test-branch 	//Checkout the branch you want to update
git merge master			//Merge all code from master to test-branch

// When your are done with test-branch you can merge all code into master branch
git checkout master 		// Make sure you are on master branch
git merge test-branch

Example 2: how to move master changes to branch

git checkout -b newfeat master
git rebase --onto working-branch origin/master newfeat
git checkout master
git reset --hard origin/master

At this point you have:
*master pointing to the last pushed commit (origin/master)
*working-branch never changed
*a new newfeat branch that contains all the new commits and is ahead of working-branch.