From: Antoine Musso <hashar@free.fr>
Date: Thu, 10 Jan 2013 09:39:43 +0000 (+0100)
Subject: ignore /.deploy used by git-deploy
X-Git-Tag: 1.31.0-rc.0~21080^2
X-Git-Url: https://git.cyclocoop.org/admin/%7B%24plugin.url%7Cescape%7D?a=commitdiff_plain;h=f456ac23502652a3d5526a92c1dc250bc73420b3;p=lhc%2Fweb%2Fwiklou.git

ignore /.deploy used by git-deploy

git-deploy writes a status file at the root of the working copy. We want
to always ignore it.

Change-Id: I4dbbce669ba4d194c3ce5568733bd27db51fd40e
---

diff --git a/.gitignore b/.gitignore
index a47a454f77..004ecf4f4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # Repository management
 .svn
 
+# git-deploy status file:
+/.deploy
+
 # Editors
 *.kate-swp
 *~