Add support for auto rebase after pull

Merged username-removed-112407 requested to merge pull.rebase into master

See issue #2692 (closed)