tree a31a22edc57ac457e1718c3145bf505b0a5db005
parent 296008cc798519d3e676e5599b3edac9de275942
author Harry Youd <harry@harryyoud.co.uk> 1500400362 +0100
committer Michael W <baddaemon87@gmail.com> 1500459332 +0000

repopick: Add 'reset' option

In case of conflict, reset to initial state by aborting the cherry-pick,
leaving the working directory clean

Change-Id: I2353b92254b67ea49835bc88b6fc9bc3910b5107