Managing gh-pages underneath master or both under grandmaster

[adam-lynch]

I'm looking for a way that the master branch and gh-pages can be under the one branch so that both can be modified under a new fork/branch; i.e. when adding implementation for something, the documentation can be done in parallel on the same branch (therefore belonging to the same pull-request).

If anyone else could help me with this I'd be grateful. I found a way to manage them both under a grand-master branch when developing locally but that's not good enough.

Having to do something manual after each push to this repo (or merge in of a pull-request) is not what I'm looking for here.