make rebase when pulling configurable, fix #39