Added information about the <rebase> option
Update mandatory arguments, added rebase
Fix conflicts output
Merge pull request #2 from infoslack/master

Added information about the <rebase> option