summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-07-27 13:19:50 -0700
committerJunio C Hamano <gitster@pobox.com>2022-07-27 13:19:50 -0700
commit619a4382fa7f2a21486472c23275f6aa3ab474e5 (patch)
treeb0d4460eda23788581b153c8567c9fe2e8271bf9
parentc0454798ac436fa16cdd2bd1adee6054b4ea93ea (diff)
parent85845580d982bb18c80c13d57680918a39338576 (diff)
downloadgit-619a4382fa7f2a21486472c23275f6aa3ab474e5.tar.xz
Merge branch 'ds/vscode-settings' into maint
* ds/vscode-settings: vscode: improve tab size and wrapping
-rwxr-xr-xcontrib/vscode/init.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh
index f139fd8644..521d303722 100755
--- a/contrib/vscode/init.sh
+++ b/contrib/vscode/init.sh
@@ -25,8 +25,12 @@ cat >.vscode/settings.json.new <<\EOF ||
"editor.detectIndentation": false,
"editor.insertSpaces": false,
"editor.tabSize": 8,
- "editor.wordWrap": "wordWrapColumn",
- "editor.wordWrapColumn": 80,
+ "files.trimTrailingWhitespace": true
+ },
+ "[txt]": {
+ "editor.detectIndentation": false,
+ "editor.insertSpaces": false,
+ "editor.tabSize": 8,
"files.trimTrailingWhitespace": true
},
"files.associations": {