Joey Hess 46e3319995 assistant: Deal with upcoming git's refusal to merge unrelated histories by default ... 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.		2016-04-22 14:26:44 -04:00
..
patches	Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb.	2015-11-10 13:21:05 -04:00
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
cabal-wrapper	support building with BUILDER=stack to use stack instead of cabal	2015-12-28 14:18:47 -04:00
changelog	assistant: Deal with upcoming git's refusal to merge unrelated histories by default	2016-04-22 14:26:44 -04:00
compat
control	fix typo	2016-03-21 10:43:24 -04:00
copyright	Merge branch 'no-cbits'	2016-03-05 11:22:32 -04:00
create-standalone-changelog	use BuildVersion in debian, which fixes windows build	2015-04-21 16:42:54 -04:00
doc-base
git-annex.lintian-overrides	merge lintian overrides from debian	2015-08-15 11:45:37 -04:00
NEWS	prep release	2013-10-02 16:13:45 -04:00
rules	move -j1 setting to BUILDEROPTIONS, set in debian/rules file	2016-02-05 13:56:27 -04:00