From 61fe5ecd4c02e23c218485471f2eb5500e2854a8 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Mon, 12 Sep 2022 15:42:00 -0700
Subject: [PATCH 1/2] Update the .gitignore template to ignore files generated
 by IntelliJ IDEA

---
 .gitignore                                      | 17 +++++++++++------
 .../rush-lib/assets/rush-init/[dot]gitignore    |  7 ++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4dd985482a1..71ed93f11b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
@@ -74,9 +85,3 @@ lib-commonjs
 dist
 *.scss.ts
 *.sass.ts
-
-# Visual Studio Code
-.vscode
-
-# Heft
-.heft
diff --git a/libraries/rush-lib/assets/rush-init/[dot]gitignore b/libraries/rush-lib/assets/rush-init/[dot]gitignore
index 05d2c20293b..41e850bba07 100644
--- a/libraries/rush-lib/assets/rush-init/[dot]gitignore
+++ b/libraries/rush-lib/assets/rush-init/[dot]gitignore
@@ -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

From 48cddef4f8fa8d9c8d4b1c0811bba11034b49b3f Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Mon, 12 Sep 2022 15:50:21 -0700
Subject: [PATCH 2/2] rush change

---
 .../octogonz-gitignore-intellij_2022-09-12-22-50.json  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/octogonz-gitignore-intellij_2022-09-12-22-50.json

diff --git a/common/changes/@microsoft/rush/octogonz-gitignore-intellij_2022-09-12-22-50.json b/common/changes/@microsoft/rush/octogonz-gitignore-intellij_2022-09-12-22-50.json
new file mode 100644
index 00000000000..a2cbdbddb55
--- /dev/null
+++ b/common/changes/@microsoft/rush/octogonz-gitignore-intellij_2022-09-12-22-50.json
@@ -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"
+}
\ No newline at end of file