diff --git a/Makefile.common b/Makefile.common index 4c9fe52..c95a98f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -143,6 +143,10 @@ pullrebase: echo "No commits exist in remote. Continuing."; \ exit 0; \ fi; \ + if [ "$$(git rev-list FETCH_HEAD | head -n 1)" = "$$(git rev-list HEAD | head -n 1)" ]; then \ + echo "Current branch up-to-date. Continuing."; \ + exit 0; \ + fi; \ echo "Rebasing to origin/master"; \ if git status --porcelain | grep -q '^.[^?]'; \ then \