Commit 5ae38538c6dd88cca058fac1b84e29df4fed60e4

Edward Thomson 2015-03-17T11:47:16

rebase: take `checkout_options` where appropriate