From f85e67659dd4116fb7f0a8014b9ed0f00c98d2f7 Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Fri, 29 Nov 2013 18:55:24 +0400 Subject: [PATCH 1/6] This is not Delphi-specific folder --- Delphi.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 02acd6a9..7c506a1a 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -11,4 +11,3 @@ __history *.dcp *.so *.apk -bin/* From 33540b975592ad3087a799b4c949c46256b3112c Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Fri, 29 Nov 2013 18:59:27 +0400 Subject: [PATCH 2/6] Nicer Delphi .gitignore - added header with link to official documentation about Delphi filetypes - added some missed file extensions - made some grouping with descriptions --- Delphi.gitignore | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 7c506a1a..61ea8577 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -1,13 +1,35 @@ -*.dcu -*.~* -*.local -*.identcache -__history -*.drc -*.map +# .gitignore template for Delphi projects +# Based on Embarcadero documentation: +# http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio + +# Delphi compiler-generated binaries *.exe *.dll *.bpl *.dcp *.so *.apk +*.drc +*.map +*.res +*.dres +*.rsm +*.tds +*.tlb + +# Delphi autogenerated files (duplicated info) +*.cfg +*Resource.rc + +# Delphi local files (user-specific info) +*.local +*.identcache +*.projdata +*.tvsconfig +*.dsk +*.deployproj +*.vlb + +# Delphi history and backups +__history/ +*.~* From 7f275ff0ec40f7824f1e8da830d8f4065b486ded Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Wed, 15 Jan 2014 18:09:26 +0400 Subject: [PATCH 3/6] Some filetypes should be commented by default --- Delphi.gitignore | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 61ea8577..17bfdf9c 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -2,6 +2,17 @@ # Based on Embarcadero documentation: # http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio +# !!! ATTENTION !!! +# These types should be ignored in most cases. +# Leave this lines commented only if you know what you are doing. +# And please DO NOT store .res files in repository. Try to get rid of them. +# +#*.res +#*.ddp +#*.vlb +#*.deployproj +# + # Delphi compiler-generated binaries *.exe *.dll @@ -11,7 +22,6 @@ *.apk *.drc *.map -*.res *.dres *.rsm *.tds @@ -27,8 +37,6 @@ *.projdata *.tvsconfig *.dsk -*.deployproj -*.vlb # Delphi history and backups __history/ From baf7fe56e6878d9212a5b1ff19399fe934e09cb7 Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Thu, 16 Jan 2014 13:05:02 +0400 Subject: [PATCH 4/6] One more compiler-generated binary --- Delphi.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Delphi.gitignore b/Delphi.gitignore index 17bfdf9c..6f5755c3 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -17,6 +17,7 @@ *.exe *.dll *.bpl +*.bpi *.dcp *.so *.apk From 432f6edf3876a5e2aa8ea545fd15f99953339aba Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Mon, 3 Feb 2014 14:52:36 +0400 Subject: [PATCH 5/6] Additional comments --- Delphi.gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 6f5755c3..39a8b66a 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -1,17 +1,24 @@ # .gitignore template for Delphi projects # Based on Embarcadero documentation: # http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio +# Some older file types can be found here: +# http://delphi.wikia.com/wiki/Delphi_File_Extensions + # !!! ATTENTION !!! # These types should be ignored in most cases. # Leave this lines commented only if you know what you are doing. # And please DO NOT store .res files in repository. Try to get rid of them. # +# Resource files usually store project icon and version info. These should be included by means of .rc files. #*.res +# Delphi Diagram Portfolio file. Used by the diagram editor in Delphi 7. Uncomment this if you are not using diagrams. #*.ddp +# Visual LiveBindings file. Uncomment this if you are not using LiveBindings Designer. #*.vlb +# Deployment Manager configuration file for your project. Uncomment this if it is not mobile development and you do not use remote debug feature. #*.deployproj -# + # Delphi compiler-generated binaries *.exe From d51b1b71e9efe3468e1af9736f415ed383ecac13 Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Thu, 13 Feb 2014 11:29:21 +0400 Subject: [PATCH 6/6] Some cleanup --- Delphi.gitignore | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 39a8b66a..e186b94c 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -1,26 +1,28 @@ -# .gitignore template for Delphi projects -# Based on Embarcadero documentation: -# http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio -# Some older file types can be found here: -# http://delphi.wikia.com/wiki/Delphi_File_Extensions - - -# !!! ATTENTION !!! -# These types should be ignored in most cases. -# Leave this lines commented only if you know what you are doing. -# And please DO NOT store .res files in repository. Try to get rid of them. +# Uncomment these types if you want even more clean repository. But be careful. +# It can make harm to an existing project source. Read explanations below. # -# Resource files usually store project icon and version info. These should be included by means of .rc files. +# Resource files are binaries containing manifest, project icon and version info. +# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files. #*.res -# Delphi Diagram Portfolio file. Used by the diagram editor in Delphi 7. Uncomment this if you are not using diagrams. +# +# Type library file (binary). In old Delphi versions it should be stored. +# Since Delphi 2009 it is produced from .ridl file and can safely be ignored. +#*.tlb +# +# Diagram Portfolio file. Used by the diagram editor up to Delphi 7. +# Uncomment this if you are not using diagrams or use newer Delphi version. #*.ddp -# Visual LiveBindings file. Uncomment this if you are not using LiveBindings Designer. +# +# Visual LiveBindings file. Added in Delphi XE2. +# Uncomment this if you are not using LiveBindings Designer. #*.vlb -# Deployment Manager configuration file for your project. Uncomment this if it is not mobile development and you do not use remote debug feature. +# +# Deployment Manager configuration file for your project. Added in Delphi XE2. +# Uncomment this if it is not mobile development and you do not use remote debug feature. #*.deployproj +# - -# Delphi compiler-generated binaries +# Delphi compiler-generated binaries (safe to delete) *.exe *.dll *.bpl @@ -33,7 +35,6 @@ *.dres *.rsm *.tds -*.tlb # Delphi autogenerated files (duplicated info) *.cfg