OK, fonud something exciting.
http://www.vogella.com/articles/Git/article.html#submodules_trackbranch

With git 1.8.2, the new feature to track branches can fix our broken workflow.
I haven't studied how to change our current git setup to adopt the new feature in 1.8.2, but after it's set up, things will be much easier.

Cheers!