diff --git a/scripts/apply-format-changes.sh b/scripts/apply-format-changes.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2d07efc0a27fb6aacca2f36b6ebd62ace57504c1
--- /dev/null
+++ b/scripts/apply-format-changes.sh
@@ -0,0 +1,13 @@
+FAIRROOT_FORMAT_BASE=upstream/master
+BASE_COMMIT=${FAIRROOT_FORMAT_BASE:-HEAD}
+CHANGED_FILES=$(git diff --name-only $BASE_COMMIT | grep -E '.*\.(h|hpp|c|C|cpp|cxx|tpl)$' | grep -viE '.*LinkDef.h$')
+
+if [ -z $GIT_CLANG_FORMAT_BIN ]; then
+  echo "GIT_CLANG_FORMAT_BIN not defined, trying to use git-clang-format-10 if present"
+  GIT_CLANG_FORMAT_BIN=git-clang-format-10
+fi
+
+$GIT_CLANG_FORMAT_BIN --verbose --commit $BASE_COMMIT $CHANGED_FILES --extensions h,hpp,c,C,cpp,cxx,tpl
+git add $CHANGED_FILES
+git status
+git commit -m"Apply clang-format"
diff --git a/scripts/check-format-changes.sh b/scripts/check-format-changes.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f75d9d6642fdaf01495c6f88d4918571848f981e
--- /dev/null
+++ b/scripts/check-format-changes.sh
@@ -0,0 +1,13 @@
+git fetch upstream
+FAIRROOT_FORMAT_BASE=upstream/master
+BASE_COMMIT=${FAIRROOT_FORMAT_BASE:-HEAD}
+CHANGED_FILES=$(git diff --name-only $BASE_COMMIT | grep -E '.*\.(h|hpp|c|C|cpp|cxx|tpl)$' | grep -viE '.*LinkDef.h$')
+
+if [ -z $GIT_CLANG_FORMAT_BIN ]; then
+  echo "Warning:"
+  echo "GIT_CLANG_FORMAT_BIN not defined, trying to use git-clang-format-10 if present"
+  echo ""
+  GIT_CLANG_FORMAT_BIN=git-clang-format-10
+fi
+
+$GIT_CLANG_FORMAT_BIN --commit $BASE_COMMIT --diff $CHANGED_FILES --extensions h,hpp,c,C,cpp,cxx,tpl