Added information about the <rebase> option

I think it would be a good idea to have the option to `git rebase`.
@infoslack Thank you, Can you fix conflicts output please