From fbe5a561d0636108fc025c1bcd28a522bcc6f381 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 Aug 2016 14:58:34 -0400 Subject: improve Sean's fix, making the wrapper still work with older git versions --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 9268d51d..425dd9e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,8 @@ propellor (3.1.2) UNRELEASED; urgency=medium Thanks, Sean Whitton. [ Sean Whitton ] - * Pass --allow-unrelated-histories to git merge. - This fixes the /usr/bin/propellor wrapper for git 2.9.x. - - Propellor now requires git to be at least version 2.9. + * Pass --allow-unrelated-histories to git merge when run with git 2.9 or + newer. This fixes the /usr/bin/propellor wrapper with this version of git. -- Joey Hess Sun, 24 Jul 2016 13:34:37 -0400 -- cgit v1.2.3