What I usually do is to create another branch based on this one, then rebase both branches on master and keep on the commits relevant to each issue. More details here:

http://git-scm.com/book/en/Git-Branching-Rebasing