Get changes from master into branch in Git


In my repository I have a branch called aq which I'm working on.

I then committed new work and bugs in master.

What is the best way to get those commits into the aq branch? Create another new branch out of master and merge it with aq?


Check out the aq branch, and rebase from master.

git checkout aq
git rebase master

Using Git, show all commits that are in one branch, but not the other(s)

How do I alias commands in git?