diff --git a/package.json b/package.json
index b4b4ba6100..7b8d01187a 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,8 @@
     "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
     "test": "jest",
     "flow": "node ./scripts/tasks/flow.js",
-    "prettier": "node ./scripts/prettier/index.js write",
+    "prettier": "node ./scripts/prettier/index.js write-changed",
+    "prettier-all": "node ./scripts/prettier/index.js write",
     "version-check": "node ./scripts/tasks/version-check.js"
   },
   "jest": {
diff --git a/scripts/prettier/index.js b/scripts/prettier/index.js
index ce2ac8dfbb..2447445c82 100644
--- a/scripts/prettier/index.js
+++ b/scripts/prettier/index.js
@@ -15,7 +15,10 @@ const glob = require('glob');
 const path = require('path');
 const execFileSync = require('child_process').execFileSync;
 
-const shouldWrite = process.argv[2] === 'write';
+const mode = process.argv[2] || 'check';
+const shouldWrite = mode === 'write' || mode === 'write-changed';
+const onlyChanged = mode === 'check-changed' || mode === 'write-changed';
+
 const isWindows = process.platform === 'win32';
 const prettier = isWindows ? 'prettier.cmd' : 'prettier';
 const prettierCmd = path.resolve(
@@ -49,6 +52,17 @@ function exec(command, args) {
   return execFileSync(command, args, options).toString();
 }
 
+var mergeBase = exec('git', ['merge-base', 'HEAD', 'master']).trim();
+var changedFiles = new Set(
+  exec('git', [
+    'diff',
+    '-z',
+    '--name-only',
+    '--diff-filter=ACMRTUB',
+    mergeBase,
+  ]).match(/[^\0]+/g)
+);
+
 Object.keys(config).forEach(key => {
   const patterns = config[key].patterns;
   const options = config[key].options;
@@ -57,7 +71,13 @@ Object.keys(config).forEach(key => {
   const globPattern = patterns.length > 1
     ? `{${patterns.join(',')}}`
     : `${patterns.join(',')}`;
-  const files = glob.sync(globPattern, {ignore});
+  const files = glob
+    .sync(globPattern, {ignore})
+    .filter(f => !onlyChanged || changedFiles.has(f));
+
+  if (!files.length) {
+    return;
+  }
 
   const args = Object.keys(defaultOptions).map(
     k => `--${k}=${(options && options[k]) || defaultOptions[k]}`