From 206c7e4577d608363f83f75e0e8499f70049cdf8 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Sun, 13 Apr 2014 13:53:34 -0700 Subject: [PATCH 1/3] improve umbraco ignores --- Umbraco.gitignore | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Umbraco.gitignore b/Umbraco.gitignore index be2db99c..563483f5 100644 --- a/Umbraco.gitignore +++ b/Umbraco.gitignore @@ -1,9 +1,17 @@ -# Ignore Umbraco folders (Generated folders created by Umbraco) -ClientDependency/ -TEMP/ -Logs/ +# Make sure to include ignores from VisualStudio.gitignore if developing on Umbraco using Visual Studio + +# Ignore unimportant folders generated by Umbraco +**/App_Data/ClientDependency/ +**/App_Data/ExamineIndexes/ +**/App_Data/Logs/ +**/App_Data/[Pp]review/ +**/App_Data/TEMP/ Cached/ -ExamineIndexes/ # Ignore Umbraco content cache file -umbraco.config +**/App_Data/umbraco.config + +# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) +# Make sure to include details from VisualStudio.gitignore BEFORE this +!**/App_Data/[Pp]ackages/ +!**/[Uu]mbraco/developer/[Pp]ackages \ No newline at end of file From 5b168d43009dbfa9e5b02dd6be7ee5961059ea61 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Tue, 6 May 2014 17:38:57 +1000 Subject: [PATCH 2/3] Remove redundant Umbraco exceptions to VS rules From the discussion on #1013: Since the rule in VS is packages/*, the fact that it contains a slash means that it is anchored to the top level. That is, is will only apply to a directory called packages at the top level, and not to any at deeper directories like App_Data. So these rules at the bottom of your changes actually aren't necessary after all. I just confirmed this with a quick test. --- Umbraco.gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Umbraco.gitignore b/Umbraco.gitignore index 563483f5..c4f7578f 100644 --- a/Umbraco.gitignore +++ b/Umbraco.gitignore @@ -10,8 +10,3 @@ Cached/ # Ignore Umbraco content cache file **/App_Data/umbraco.config - -# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) -# Make sure to include details from VisualStudio.gitignore BEFORE this -!**/App_Data/[Pp]ackages/ -!**/[Uu]mbraco/developer/[Pp]ackages \ No newline at end of file From 7955283b13f7b8fe23bb91b9ea6e2f4cc14ba6f3 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Tue, 6 May 2014 17:42:22 +1000 Subject: [PATCH 3/3] Shorten note in comment at the top --- Umbraco.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbraco.gitignore b/Umbraco.gitignore index c4f7578f..f762672e 100644 --- a/Umbraco.gitignore +++ b/Umbraco.gitignore @@ -1,4 +1,4 @@ -# Make sure to include ignores from VisualStudio.gitignore if developing on Umbraco using Visual Studio +# Note: VisualStudio gitignore rules may also be relevant # Ignore unimportant folders generated by Umbraco **/App_Data/ClientDependency/