added rebasing to standard git sync