Merge "Switch --hash-style to gnu"