I always put the ticket number in the message, at the start. I use rebase to avoid merge commits and discourage diverging too much from origin/master.