Merge branch 'jc/reflog-parse-options'