This problem is universal. The solution is to use --words instead of -s single letter options. Thankfully, git has a good manual that covers all the options:

https://git-man-page-generator.lokaltog.net/