Merge branch 'js/rerere-forget-always-take-pathspec'