You don't have to be an expert in git to use these properly, especially re-base. If you find yourself arguing with Git most of the time, I recommend doing this:

1. Get a good night's sleep and wake up early, pour yourself a nice cup of coffee or your favorite beverage.

2. Open a copy of ProGit (free here: https://git-scm.com/book/en/v2) and read it cover to cover, while using something like Learn Git Branching (https://learngitbranching.js.org/) to try out what you're learning to get a better understanding.

3. Take a few walks and do your best to read the book cover to cover in a day.

4. Get a good night's sleep to cement the information in.

Git is not simple, but it's very powerful. But I also believe it doesn't take much to become an "expert" (if you already know how to edit text files and know basic command line usage + syntax). I don't think it's a lot to ask to block out a day or two to learn how it really works (at the very least chapter 10 in ProGit, Internals).

I see too many engineers arguing against git from a lack of understanding what commands actually do. Like it or not it's a corner stone of modern software development, and for some good reasons too.