From 5f655088eff259296ac5e9244e154d3ed1fc9306 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 12 Nov 2013 17:03:25 -0500 Subject: [PATCH] Fix ~/.gitattributes syntax. For git that's not between version 1.8.1.1 and 1.8.1.6, the previous version did not actually exclude those things from the tarballs on some git versions, due to changes in the syntax for that file that were made in 1.8.1.1 and reverted in 1.8.1.6. Kevin's also adding a check that we're not including any of the files intended to be excluded here. (imported from commit 503ec24ed8db4cc32c29bdf5a361e5013a02b995) --- .gitattributes | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitattributes b/.gitattributes index a269ff76bd..cb4e422f83 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,13 +1,13 @@ .gitignore export-ignore .gitattributes export-ignore -analytics/ export-ignore -assets/ export-ignore -bots/ export-ignore -corporate/ export-ignore -static/ export-ignore -tools/ export-ignore -zilencer/ export-ignore -templates/analytics/ export-ignore -templates/corporate/ export-ignore -puppet/zulip_internal/ export-ignore -zproject/local_settings.py export-ignore +/analytics export-ignore +/assets export-ignore +/bots export-ignore +/corporate export-ignore +/static export-ignore +/tools export-ignore +/zilencer export-ignore +/templates/analytics export-ignore +/templates/corporate export-ignore +/puppet/zulip_internal export-ignore +/zproject/local_settings.py export-ignore