diff --git a/merge_helpers.sh b/merge_helpers.sh index 81d712ab2d..0eba6911e2 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -11,6 +11,9 @@ revert_last() { } require_clean_git() { + if [ "$NO_REQUIRE_CLEAN_GIT" = "y" ]; then + return + fi uncommitted=`git status --porcelain` if [ ! -z "$uncommitted" ]; then echo "Uncommitted changes are present, please commit first!"