diff --git a/docs/guide/cli-service.md b/docs/guide/cli-service.md
index a5376d1e07..3f4b9c09e3 100644
--- a/docs/guide/cli-service.md
+++ b/docs/guide/cli-service.md
@@ -169,10 +169,7 @@ When installed, `@vue/cli-service` also installs [yorkie](https://github.com/yyx
     "pre-commit": "lint-staged"
   },
   "lint-staged": {
-    "*.{js,vue}": [
-      "vue-cli-service lint",
-      "git add"
-    ]
+    "*.{js,vue}": "vue-cli-service lint"
   }
 }
 ```
diff --git a/docs/ru/guide/cli-service.md b/docs/ru/guide/cli-service.md
index 35eeea09e5..bca0c08064 100644
--- a/docs/ru/guide/cli-service.md
+++ b/docs/ru/guide/cli-service.md
@@ -166,10 +166,7 @@ npx vue-cli-service build --skip-plugins @vue/cli-plugin-pwa
     "pre-commit": "lint-staged"
   },
   "lint-staged": {
-    "*.{js,vue}": [
-      "vue-cli-service lint",
-      "git add"
-    ]
+    "*.{js,vue}": "vue-cli-service lint"
   }
 }
 ```
diff --git a/docs/zh/guide/cli-service.md b/docs/zh/guide/cli-service.md
index 5044cd4b3a..d1714578a8 100644
--- a/docs/zh/guide/cli-service.md
+++ b/docs/zh/guide/cli-service.md
@@ -128,10 +128,7 @@ npx vue-cli-service help [command]
     "pre-commit": "lint-staged"
   },
    "lint-staged": {
-    "*.{js,vue}": [
-      "vue-cli-service lint",
-      "git add"
-    ]
+    "*.{js,vue}": "vue-cli-service lint"
   }
 }
 ```
diff --git a/package.json b/package.json
index 82ed147b9d..3881da0cd6 100644
--- a/package.json
+++ b/package.json
@@ -26,14 +26,8 @@
     "commit-msg": "node scripts/verifyCommitMsg.js"
   },
   "lint-staged": {
-    "*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ],
-    "packages/**/bin/*": [
-      "eslint --fix",
-      "git add"
-    ]
+    "*.{js,vue}": "eslint --fix",
+    "packages/**/bin/*": "eslint --fix"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -67,7 +61,7 @@
     "jest": "^26.6.3",
     "lerna": "^3.22.0",
     "lerna-changelog": "^1.0.1",
-    "lint-staged": "^9.5.0",
+    "lint-staged": "^10.5.3",
     "memfs": "^3.2.0",
     "minimist": "^1.2.5",
     "node-fetch": "^2.6.1",
diff --git a/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js b/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js
index 7300750861..7996cde448 100644
--- a/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js
+++ b/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js
@@ -157,7 +157,7 @@ test('lint on commit', async () => {
   expect(pkg.gitHooks['pre-commit']).toBe('lint-staged')
   expect(pkg.devDependencies).toHaveProperty('lint-staged')
   expect(pkg['lint-staged']).toEqual({
-    '*.{js,jsx,vue}': ['vue-cli-service lint', 'git add']
+    '*.{js,jsx,vue}': 'vue-cli-service lint'
   })
   expect(pkg.vue).toEqual({
     lintOnSave: false
@@ -176,7 +176,7 @@ test('should lint ts files when typescript plugin co-exists', async () => {
   const pkg = JSON.parse(await read('package.json'))
   expect(pkg).toMatchObject({
     'lint-staged': {
-      '*.{js,jsx,vue,ts,tsx}': ['vue-cli-service lint', 'git add']
+      '*.{js,jsx,vue,ts,tsx}': 'vue-cli-service lint'
     }
   })
 })
diff --git a/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js b/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js
index 71b1134a89..c7e61bab13 100644
--- a/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js
+++ b/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js
@@ -45,7 +45,8 @@ test('should work', async () => {
   })
   const hook = await read('.git/hooks/pre-commit')
   expect(hook).toMatch('#yorkie')
-  await write('src/main.js', updatedMain)
+  // add a trivial change to avoid empty changeset after running lint-staged
+  await write('src/main.js', updatedMain.replace('false', 'true'))
   // nvm doesn't like PREFIX env
   if (process.platform === 'darwin') {
     delete process.env.PREFIX
diff --git a/packages/@vue/cli-plugin-eslint/generator/index.js b/packages/@vue/cli-plugin-eslint/generator/index.js
index 049f6b74cf..9ac49df89c 100644
--- a/packages/@vue/cli-plugin-eslint/generator/index.js
+++ b/packages/@vue/cli-plugin-eslint/generator/index.js
@@ -38,7 +38,7 @@ module.exports = (api, { config, lintOn = [] }, rootOptions, invoking) => {
 
   if (lintOn.includes('commit')) {
     Object.assign(pkg.devDependencies, {
-      'lint-staged': '^9.5.0'
+      'lint-staged': '^10.5.3'
     })
     pkg.gitHooks = {
       'pre-commit': 'lint-staged'
@@ -46,7 +46,7 @@ module.exports = (api, { config, lintOn = [] }, rootOptions, invoking) => {
     const extensions = require('../eslintOptions').extensions(api)
       .map(ext => ext.replace(/^\./, ''))  // remove the leading `.`
     pkg['lint-staged'] = {
-      [`*.{${extensions.join(',')}}`]: ['vue-cli-service lint', 'git add']
+      [`*.{${extensions.join(',')}}`]: 'vue-cli-service lint'
     }
   }
 
diff --git a/packages/@vue/cli-service/migrator/index.js b/packages/@vue/cli-service/migrator/index.js
index 3270c234eb..10f9572222 100644
--- a/packages/@vue/cli-service/migrator/index.js
+++ b/packages/@vue/cli-service/migrator/index.js
@@ -11,4 +11,6 @@ module.exports = (api) => {
 
     api.exitLog('vue-cli-plugin-vue-next is removed because Vue 3 support has been built into the core plugins.')
   }
+
+  // TODO: lint-staged update
 }
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index c594673e68..ef2b742e76 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -84,7 +84,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-vue": "^7.2.0",
-    "lint-staged": "^9.5.0",
+    "lint-staged": "^10.5.3",
     "lodash.debounce": "^4.0.8",
     "portal-vue": "^1.3.0",
     "rimraf": "^3.0.2",
@@ -123,14 +123,7 @@
     "pre-commit": "lint-staged"
   },
   "lint-staged": {
-    "*.js": [
-      "vue-cli-service lint",
-      "git add"
-    ],
-    "*.vue": [
-      "vue-cli-service lint",
-      "git add"
-    ]
+    "*.{js,vue}": "vue-cli-service lint"
   },
   "vuePlugins": {
     "ui": [