I want to know what the trailer will show: how much from the SDCC one, and how much newer that we ultimately have't seen yet?

Well according to NTF, it's going to be all new footage that wasn't shown at ComiCon. Which is completely fine by me, since I have seen it a million times over already. I still have it saved on my computer and I watch it several times daily.