tree e41e76033064a4e77778e6f89a5da11dea4d7748
parent b2a0f6fd1a23817823a1b1387f33952f41d19c48
author Harry Youd <harry@harryyoud.co.uk> 1500400362 +0100
committer Eric Park <ideamaneric@gmail.com> 1526818818 -0400
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJbAWgCAAoJEH+sFsmodNG5WWYP/31C/+Ty6GLhOd7Pb+3qcaqo
 wo9hKgu3ImtEr1LlKw3JF8Rw3Ch6uy52h2NWKPofrxALXv5ybNKkeRWYWLkb0s9j
 s3Ao1+uWSrPb7Ka52RPlxudKgz1oHE1Q9pqK0zSCtenl9XaB42Q0R1aXM2qbXmXN
 hLuv0M6VokCMWkn+8AjPtQpJX+YG04pbmuKsQzw7L4SddKngyYujBWY3ZFOBUDUp
 DhyHGDRnbzlSXzr6/p8qNgLh18ppav38o9vwpCQUzySp42naDw5MG8qvwLKXQPoI
 UGMtSCwcyTUrkEkiU5ku1+AvZUq96D5WevSqzdCCIeqht1u1HaAWq3jcuY1a3/t5
 62Jq4kwkiWqlVLIjTKA1YCTWaIwZ6yVjyjzMC8WpuG5kfz77CtttZJoG9UprD9YH
 PW+xxTldKOF8YwFnkFKQveC3fRdDVa4qRVefdQcZy+uPPfipH/Evok3RUNz8OHl+
 VaEN6UBtv/g2BLq5uGdJZZfSD62qUR5MVlQAjEXYTth80bICiOL0Tf35zT12wTrC
 tIoaAYUg04RQbBj9eDxXCoEykK4eGcMbT1jd1/tGonyFEdyPHBNbgtR77RDHJTjT
 OWmqDltWhdgj1lSU5adIXR49Hq3+fqt+JMMIXPegcAvQPXANauszsNGWQgt1hGIm
 1BZvM8jUzgRUivwO+ua0
 =+kk+
 -----END PGP SIGNATURE-----

repopick: Add 'reset' option

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

Change-Id: I93944e9042d162804520d5aac8f0b91043fd10e9