From 845d9de7ab790a1691237c8f3b7a6bf8787b3489 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 20 Aug 2016 08:33:20 -0700 Subject: pass --allow-unrelated-histories to git merge Fixes merging the /usr/src/propellor git bundle with git 2.9. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 9194b6c2..21a524d0 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libghc-stm-dev, libghc-text-dev, libghc-concurrent-output-dev, - git, + git (>= 1:2.9), make, Description: property-based host configuration management in haskell Propellor ensures that the system it's run in satisfies a list of -- cgit v1.3-2-g0d8e