Get changes from master into branch in Git

Check out the aq branch, and rebase from master.

git checkout aq
git rebase master

You should be able to just git merge origin/master when you are on your aq branch.

git checkout aq
git merge origin/master