summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2016-08-20 14:58:34 -0400
committerJoey Hess2016-08-20 14:58:34 -0400
commitfbe5a561d0636108fc025c1bcd28a522bcc6f381 (patch)
treea17f5c69836dd293bb916284ece8f962061a5ef4 /debian
parent845d9de7ab790a1691237c8f3b7a6bf8787b3489 (diff)
improve Sean's fix, making the wrapper still work with older git versions
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 2 insertions, 3 deletions
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 <id@joeyh.name> Sun, 24 Jul 2016 13:34:37 -0400