summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 15:56:13 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 15:57:28 -0400
commitf9d8dd908fb60b83cb4bb40acae2a0cea87fa8c3 (patch)
treed022a7b4d700b727ae0ec251dc66072572bc0063 /debian/changelog
parent86e7c4d5330ebf96f82116d0a1738f765d21606d (diff)
use --allow-unrelated-histories for now
I'd prefer to use the env var, but let's use what git currently supports. Revert this when the env var gets supported. Note that the version checking assumes git 2.8.2 will get support for the switch.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog7
1 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 0775a1270..938ed35c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,10 +19,9 @@ git-annex (6.20160419) UNRELEASED; urgency=medium
* git 2.8.1 (or perhaps 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 by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES
- when the assistant merges. Note though that this is not done for
- git annex sync's merges, so it will follow git's default or configured
- behavior.
+ this behavior change when the assistant merges. Note though that this is
+ not done for git annex sync's merges, so it will follow git's default or
+ configured behavior.
-- Joey Hess <id@joeyh.name> Tue, 19 Apr 2016 12:57:15 -0400