Merge pull request microsoft#1707 from microsoft/octogonz/rush-gitignore

iclanton · web-flow · commit 32a700a9bfa3 · 2020-01-21T19:21:50.000-08:00
[rush] Update the "rush init" generated .gitignore file
diff --git a/.gitignore b/.gitignore
@@ -9,9 +9,6 @@ yarn-error.log*
 *.seed
 *.pid.lock
 
-# Visual Studio Code
-.vscode
-
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
@@ -58,21 +55,24 @@ jspm_packages/
 # next.js build output
 .next
 
+# OS X temporary files
+.DS_Store
+
+# Rush temporary files
+common/temp/
+**/.rush/temp/
+
 # Common toolchain intermediate files
+temp
 lib
 lib-amd
 lib-es6
 dist
-temp
 *.scss.ts
 *.sass.ts
 
-# Rush files
-common/temp/**
-.rush/temp/**
+# Visual Studio Code
+.vscode
 
 # Remove eventually
 package-deps.json
-
-# OS X
-.DS_Store
diff --git a/apps/rush-lib/assets/rush-init/[dot]gitignore b/apps/rush-lib/assets/rush-init/[dot]gitignore
@@ -55,9 +55,9 @@ jspm_packages/
 # next.js build output
 .next
 
-# Common toolchain intermediate files
-temp
+# OS X temporary files
+.DS_Store
 
-# Rush files
-common/temp/**
-.rush/temp/**
+# Rush temporary files
+common/temp/
+**/.rush/temp/
diff --git a/common/changes/@microsoft/rush/octogonz-rush-gitignore_2020-01-22-00-26.json b/common/changes/@microsoft/rush/octogonz-rush-gitignore_2020-01-22-00-26.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Update the \"rush init\" .gitignore file to ignore .rush/temp and .DS_Store folders",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
