summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-27 13:54:46 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-27 13:54:46 -0400
commit1f9cf1bf452a1edceb9f3b36d2e5b6083703b1a4 (patch)
tree917889d6b424bf5049b3a91f6d8979cf30d85631 /debian/changelog
parent87d953fd2f2b40c24eb4c796f0e78a2399fc9020 (diff)
--allow-unrelated-histories will be in git 2.9.0, not 2.8.2
Also, I had the logic backwards in the version comparison.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f19b7141e..e536c5029 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ git-annex (6.20160419) UNRELEASED; urgency=medium
to refer to a file.
* Fix bug that prevented annex.sshcaching=false configuration from taking
effect when on a crippled filesystem. Thanks, divergentdave.
- * git 2.8.2 is going to prevent git merge from merging in unrelated
+ * git 2.9.0 is going to prevent git merge from merging in unrelated
branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around
this behavior change when the assistant merges, by passing