diff --git a/scripts/prettier_on_changed.js b/scripts/prettier_on_changed.js
new file mode 100644
index 000000000000..f9598110f91f
--- /dev/null
+++ b/scripts/prettier_on_changed.js
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+require('../src/setup_node_env/babel_register');
+require('../src/dev/run_prettier_on_changed');
diff --git a/src/dev/eslint/index.js b/src/dev/eslint/index.ts
similarity index 100%
rename from src/dev/eslint/index.js
rename to src/dev/eslint/index.ts
diff --git a/src/dev/eslint/lint_files.js b/src/dev/eslint/lint_files.ts
similarity index 90%
rename from src/dev/eslint/lint_files.js
rename to src/dev/eslint/lint_files.ts
index a76edeb2eb86..80c493233f39 100644
--- a/src/dev/eslint/lint_files.js
+++ b/src/dev/eslint/lint_files.ts
@@ -19,7 +19,8 @@
 
 import { CLIEngine } from 'eslint';
 
-import { createFailError } from '@kbn/dev-utils';
+import { createFailError, ToolingLog } from '@kbn/dev-utils';
+import { File } from '../file';
 import { REPO_ROOT } from '../constants';
 
 /**
@@ -30,7 +31,7 @@ import { REPO_ROOT } from '../constants';
  * @param  {Array<File>} files
  * @return {undefined}
  */
-export function lintFiles(log, files, { fix } = {}) {
+export function lintFiles(log: ToolingLog, files: File[], { fix }: { fix?: boolean } = {}) {
   const cli = new CLIEngine({
     cache: true,
     cwd: REPO_ROOT,
diff --git a/src/dev/eslint/pick_files_to_lint.js b/src/dev/eslint/pick_files_to_lint.ts
similarity index 88%
rename from src/dev/eslint/pick_files_to_lint.js
rename to src/dev/eslint/pick_files_to_lint.ts
index e3212c00d9e0..b96781fc3a61 100644
--- a/src/dev/eslint/pick_files_to_lint.js
+++ b/src/dev/eslint/pick_files_to_lint.ts
@@ -16,9 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import { CLIEngine } from 'eslint';
 
+import { ToolingLog } from '@kbn/dev-utils';
+import { File } from '../file';
+
 /**
  * Filters a list of files to only include lintable files.
  *
@@ -26,8 +28,8 @@ import { CLIEngine } from 'eslint';
  * @param  {Array<File>} files
  * @return {Array<File>}
  */
-export function pickFilesToLint(log, files) {
-  const cli = new CLIEngine();
+export function pickFilesToLint(log: ToolingLog, files: File[]) {
+  const cli = new CLIEngine({});
 
   return files.filter(file => {
     if (!file.isJs() && !file.isTypescript()) {
diff --git a/src/dev/run_prettier_on_changed.ts b/src/dev/run_prettier_on_changed.ts
new file mode 100644
index 000000000000..deca4fa1be3c
--- /dev/null
+++ b/src/dev/run_prettier_on_changed.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import execa from 'execa';
+// @ts-ignore
+import SimpleGit from 'simple-git';
+import { run } from '@kbn/dev-utils';
+import dedent from 'dedent';
+import Util from 'util';
+
+import pkg from '../../package.json';
+import { REPO_ROOT } from './constants';
+import { File } from './file';
+import * as Eslint from './eslint';
+
+run(async function getChangedFiles({ log }) {
+  const simpleGit = new SimpleGit(REPO_ROOT);
+
+  const getStatus = Util.promisify(simpleGit.status.bind(simpleGit));
+  const gitStatus = await getStatus();
+
+  if (gitStatus.files.length > 0) {
+    throw new Error(
+      dedent(`You should run prettier formatter on a clean branch.
+        Found not committed changes to:
+        ${gitStatus.files.map((f: { path: string }) => f.path).join('\n')}`)
+    );
+  }
+
+  const revParse = Util.promisify(simpleGit.revparse.bind(simpleGit));
+  const currentBranch = await revParse(['--abbrev-ref', 'HEAD']);
+  const headBranch = pkg.branch;
+
+  const diff = Util.promisify(simpleGit.diff.bind(simpleGit));
+
+  const changedFileStatuses: string = await diff([
+    '--name-status',
+    `${headBranch}...${currentBranch}`,
+  ]);
+
+  const changedFiles = changedFileStatuses
+    .split('\n')
+    // Ignore blank lines
+    .filter(line => line.trim().length > 0)
+    // git diff --name-status outputs lines with two OR three parts
+    // separated by a tab character
+    .map(line => line.trim().split('\t'))
+    .map(([status, ...paths]) => {
+      // ignore deleted files
+      if (status === 'D') {
+        return undefined;
+      }
+
+      // the status is always in the first column
+      // .. If the file is edited the line will only have two columns
+      // .. If the file is renamed it will have three columns
+      // .. In any case, the last column is the CURRENT path to the file
+      return new File(paths[paths.length - 1]);
+    })
+    .filter((file): file is File => Boolean(file));
+
+  const pathsToLint = Eslint.pickFilesToLint(log, changedFiles).map(f => f.getAbsolutePath());
+
+  if (pathsToLint.length > 0) {
+    log.debug('[prettier] run on %j files: ', pathsToLint.length, pathsToLint);
+  }
+
+  while (pathsToLint.length > 0) {
+    await execa('npx', ['prettier@2.0.4', '--write', ...pathsToLint.splice(0, 100)]);
+  }
+});