add safer pull/rebase