am 3b842a86: keep history after reset to master-nova-dev

* commit '3b842a8628da809286b810b6881e382890ead1f6':