I hate having to always fix interrupted pulls/merges; automate it
Revert "Don't sort -r"

This reverts commit d2aa9432ff2dfe0108f9b54b0fb2e0f395587f52.
Remove -j24 hardcoding

I'm not going to be running this on systems that don't scale
well on FreeBSD for a while (SNB+).

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
Fix this script when used with GNU sort

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>