Ok good, that should make the history more straight and simple.
Still, it would be nice if git had some builtin concept of cherry-picked patches between branches, so it'd be possible to write e.g. "git log 7.6..7.8" to see all commits that really are in 7.8 only.