summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorSean Whitton2016-08-20 08:33:20 -0700
committerJoey Hess2016-08-20 14:52:23 -0400
commit845d9de7ab790a1691237c8f3b7a6bf8787b3489 (patch)
tree621987633d74e720cb54754605e537128aee9ceb /debian/changelog
parent5020a86907ade611324c66c82cf4ee074789bdd5 (diff)
pass --allow-unrelated-histories to git merge
Fixes merging the /usr/src/propellor git bundle with git 2.9.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 74045c76..9268d51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
propellor (3.1.2) UNRELEASED; urgency=medium
+ [ Joey Hess ]
* Ssh.knownHost: Bug fix: Only fix up the owner of the known_hosts
file after it exists.
* Sbuild.keypairInsecurelyGenerated: Improved to be more robust.
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.
+
-- Joey Hess <id@joeyh.name> Sun, 24 Jul 2016 13:34:37 -0400
propellor (3.1.1) unstable; urgency=medium