aggressively fast-forward when history is cleared

Signed-off-by: Chris Adams <cadams@pivotallabs.com>