currybullen: ok so just so I understand you, the timeline is:
1. Commit A onto branch b1
2. Commit B onto branch b2
3. Merge b1 into b2
4. Commit C, D onto branch b2
5. Reset b2 to B