From 63b82d6afeea443a4a7866e84d4a488cde1a7a49 Mon Sep 17 00:00:00 2001
From: Dan Cryer <dan@block8.co.uk>
Date: Mon, 12 May 2014 16:35:35 +0100
Subject: [PATCH] Adding git config to the docker file

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 9b64eaea..da4411c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,10 @@ RUN apt-get update
 # Install PHP:
 RUN apt-get install -qy git-core php5-common php5-cli php5-curl php5-imap php5-mcrypt php5-mysqlnd
 
+# Give Git some fake user details to prevent it asking when trying to test merges:
+git config --global user.name "PHPCI"
+git config --global user.email "hello@php.ci"
+
 ADD ./ /phpci
 
 CMD /phpci/daemonise phpci:daemonise