diff --git a/lib/config/cli.js b/lib/config/cli.js
index 8c22a2c09676e661df683b1224c0d95248406626..44570d4808a4abd472251e26affe126ca29ab145 100644
--- a/lib/config/cli.js
+++ b/lib/config/cli.js
@@ -17,16 +17,18 @@ function getCliName(option) {
 
 function getConfig(input) {
   // massage migrated configuration keys
-  const argv = input.map(a =>
-    a
-      .replace('--endpoints=', '--host-rules=')
-      .replace('--expose-env=true', '--trust-level=high')
-      .replace('--expose-env', '--trust-level=high')
-      .replace('--renovate-fork', '--include-forks')
-      .replace('"platform":"', '"hostType":"')
-      .replace('"endpoint":"', '"baseUrl":"')
-      .replace('"host":"', '"hostName":"')
-  );
+  const argv = input
+    .map(a =>
+      a
+        .replace('--endpoints=', '--host-rules=')
+        .replace('--expose-env=true', '--trust-level=high')
+        .replace('--expose-env', '--trust-level=high')
+        .replace('--renovate-fork', '--include-forks')
+        .replace('"platform":"', '"hostType":"')
+        .replace('"endpoint":"', '"baseUrl":"')
+        .replace('"host":"', '"hostName":"')
+    )
+    .filter(a => !a.startsWith('--git-fs'));
   const options = configDefinitions.getOptions();
 
   const config = {};
diff --git a/lib/config/migration.js b/lib/config/migration.js
index 223168fefa3b68e35f4ebb6104c610fb6820c10e..868dd8598632217f5f9b3635a38b3c2df07a5307 100644
--- a/lib/config/migration.js
+++ b/lib/config/migration.js
@@ -121,6 +121,9 @@ function migrateConfig(config, parentKey) {
         } else if (val === false) {
           migratedConfig.rangeStrategy = 'replace';
         }
+      } else if (key === 'gitFs') {
+        isMigrated = true;
+        delete migratedConfig.gitFs;
       } else if (key === 'exposeEnv') {
         isMigrated = true;
         delete migratedConfig.exposeEnv;
diff --git a/test/config/__snapshots__/migration.spec.js.snap b/test/config/__snapshots__/migration.spec.js.snap
index b0134cbafd814a0d7c7db256bf713526b8250542..0408283bbf2e640e3b575d3df1357fd21049472d 100644
--- a/test/config/__snapshots__/migration.spec.js.snap
+++ b/test/config/__snapshots__/migration.spec.js.snap
@@ -21,7 +21,6 @@ Object {
     "config:js-app",
     "config:js-lib",
   ],
-  "gitFs": false,
   "hostRules": Array [
     Object {},
   ],
@@ -31,7 +30,6 @@ Object {
   "includeForks": true,
   "lockFileMaintenance": Object {
     "automerge": true,
-    "gitFs": true,
     "schedule": "before 5am",
     "trustLevel": "low",
   },