To merge changed from detached HEAD into master, run:
git rebase HEAD master
then checkout master (use -f for force):
git checkout master
If you've got multiple submodules to deal with, use: git submodule foreach, e.g.
git submodule foreach git pull origin master -r