Skip to content

Commit

Permalink
Merge pull request #3622 from microsoft/octogonz/gitignore-intellij
Browse files Browse the repository at this point in the history
Update the .gitignore template to ignore files generated by IntelliJ IDEA
  • Loading branch information
iclanton authored Sep 12, 2022
2 parents c7e3c46 + 48cddef commit b6bd043
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 7 deletions.
17 changes: 11 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,23 @@ jspm_packages/
# OS X temporary files
.DS_Store

# IntelliJ IDEA project files; if you want to commit IntelliJ settings, this recipe may be helpful:
# https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
.idea/
*.iml

# Visual Studio Code
.vscode

# Rush temporary files
common/deploy/
common/temp/
common/autoinstallers/*/.npmrc
**/.rush/temp/

# Heft temporary files
.heft

# Common toolchain intermediate files
temp
lib
Expand All @@ -74,9 +85,3 @@ lib-commonjs
dist
*.scss.ts
*.sass.ts

# Visual Studio Code
.vscode

# Heft
.heft
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@microsoft/rush",
"comment": "Update the \"rush init\" template to include .gitignore patterns for IntellJ IDEA",
"type": "none"
}
],
"packageName": "@microsoft/rush"
}
7 changes: 6 additions & 1 deletion libraries/rush-lib/assets/rush-init/[dot]gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,16 @@ jspm_packages/
# OS X temporary files
.DS_Store

# IntelliJ IDEA project files; if you want to commit IntelliJ settings, this recipe may be helpful:
# https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
.idea/
*.iml

# Rush temporary files
common/deploy/
common/temp/
common/autoinstallers/*/.npmrc
**/.rush/temp/

# Heft
# Heft temporary files
.heft

0 comments on commit b6bd043

Please sign in to comment.