New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/35810#issuecomment-1050159431

Comment:
For updating branches without a merge commit you can use `git pull --rebase upstream master` as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#getting-your-packages-into-void-by-yourself

I recommend reading https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History