Skip to content

Commit b6bd043

Browse files
authored
Merge pull request #3622 from microsoft/octogonz/gitignore-intellij
Update the .gitignore template to ignore files generated by IntelliJ IDEA
2 parents c7e3c46 + 48cddef commit b6bd043

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

.gitignore

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,23 @@ jspm_packages/
5858
# OS X temporary files
5959
.DS_Store
6060

61+
# IntelliJ IDEA project files; if you want to commit IntelliJ settings, this recipe may be helpful:
62+
# https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
63+
.idea/
64+
*.iml
65+
66+
# Visual Studio Code
67+
.vscode
68+
6169
# Rush temporary files
6270
common/deploy/
6371
common/temp/
6472
common/autoinstallers/*/.npmrc
6573
**/.rush/temp/
6674

75+
# Heft temporary files
76+
.heft
77+
6778
# Common toolchain intermediate files
6879
temp
6980
lib
@@ -74,9 +85,3 @@ lib-commonjs
7485
dist
7586
*.scss.ts
7687
*.sass.ts
77-
78-
# Visual Studio Code
79-
.vscode
80-
81-
# Heft
82-
.heft
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/rush",
5+
"comment": "Update the \"rush init\" template to include .gitignore patterns for IntellJ IDEA",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush"
10+
}

libraries/rush-lib/assets/rush-init/[dot]gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,16 @@ jspm_packages/
5858
# OS X temporary files
5959
.DS_Store
6060

61+
# IntelliJ IDEA project files; if you want to commit IntelliJ settings, this recipe may be helpful:
62+
# https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
63+
.idea/
64+
*.iml
65+
6166
# Rush temporary files
6267
common/deploy/
6368
common/temp/
6469
common/autoinstallers/*/.npmrc
6570
**/.rush/temp/
6671

67-
# Heft
72+
# Heft temporary files
6873
.heft

0 commit comments

Comments
 (0)