git-annex-gpl - git-annex without the AGPL

	Commit message (Collapse)	Author	Age
*	prep release6.20160923	Joey Hess	2016-09-23
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2016-09-23
\|\
* \|	use System.Directory not Utility.Directory	Joey Hess	2016-09-22
\| \| \| \| \| \| \| \| \| \|	This module does not use isSymbolicLink so avoid depending on extra Utility.* stuff, to make it more easily reused elsewhere.
* \|	avoid needing PartialPrelude	Joey Hess	2016-09-22
\| \|
* \|	use takeDirectory instead of parentDir	Joey Hess	2016-09-22
\| \| \| \| \| \| \| \| \| \|	No need for a trailing slash in the directory here, so avoid pulling in an extra module.
* \|	avoid using split unnecessarily	Joey Hess	2016-09-22
\| \| \| \| \| \| \| \|	I'd like to get rid of all uses of Data.String.Utils eventually..
\| *	Added a comment: thanks for considering this!	https://anarc.at/openid/	2016-09-22
\| \|
\| *	Added a comment: simpler use case	JasonWoof	2016-09-22
\| \|
\| *	Added a comment	interfect@b151490178830f44348aa57b77ad58c7d18e8fe7	2016-09-21
\|/
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2016-09-21
\|\
* \|	pin concurrent-output to a version that works on windows	Joey Hess	2016-09-21
\| \|
* \|	Revert "stack.yaml: Update to lts-7.0 (ghc 8)"	Joey Hess	2016-09-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1f51e4c31db44507d31447ac7d63406918738807. This broke the i386ancient autobuilder due to its use of --flag git-annex:XMPP --flag=git-annex:dbus -- Failure when adding dependencies: fdo-notify: needed ((>=0.3)), stack configuration has no specified version (latest applicable is 0.3.1) gnutls: needed ((>=0.1.4)), stack configuration has no specified version (latest applicable is 0.2) network-protocol-xmpp: needed (-any), stack configuration has no specified version (latest applicable is 0.4.8) OSX autobuilder also seems hosed by it, so too soon. De-revert later..
* \|	devblog	Joey Hess	2016-09-21
\| \|
* \|	update	Joey Hess	2016-09-21
\| \|
* \|	comment	Joey Hess	2016-09-21
\| \|
\| *	Added a comment: re: regular ssh remote	dave@2ab82f485adf7e2ce787066e35f5f9789bff430b	2016-09-21
\| \|
* \|	addurl, importfeed: Improve behavior when file being added is gitignored.	Joey Hess	2016-09-21
\| \|
\| *	Added a comment: re: mangling is normal	dave@2ab82f485adf7e2ce787066e35f5f9789bff430b	2016-09-21
\| \|
* \|	comment	Joey Hess	2016-09-21
\| \|
* \|	comment	Joey Hess	2016-09-21
\|/
*	comment	Joey Hess	2016-09-21
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2016-09-21
\|\
* \|	response	Joey Hess	2016-09-21
\| \|
* \|	response	Joey Hess	2016-09-21
\| \|
* \|	comment	Joey Hess	2016-09-21
\| \|
* \|	update	Joey Hess	2016-09-21
\| \|
* \|	merge	Joey Hess	2016-09-21
\| \|
* \|	comment	Joey Hess	2016-09-21
\| \|
\| *	Added a comment	interfect@b151490178830f44348aa57b77ad58c7d18e8fe7	2016-09-21
\| \|
* \|	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2016-09-21
\|\\|
* \|	fix bugs in handing of deep branches with sync and adjusted branches	Joey Hess	2016-09-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* sync: Previously, when run in a branch with a slash in its name, such as "foo/bar", the sync branch was "synced/bar". That conflicted with the sync branch used for branch "bar", so has been changed to "synced/foo/bar". * adjust: Previously, when adjusting a branch with a slash in its name, such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)". That conflicted with the adjusted branch used for branch "bar", so has been changed to "adjusted/foo/bar(unlocked)" * Also, running sync in an adjusted branch did not correctly sync changes back to the parent branch when it had a slash in its name. This bug has been fixed. Eliminate use of Git.Ref.under and Git.Ref.basename; using Git.Ref.underBase and Git.Ref.base make everything handle deep branches correctly. Probably noone was adjusting deep branches, and v6 is still experimental anyway, so I'm not going to worry about the mess that was left by that bug. In the case of git-annex sync, using a fixed git-annex with an old unfixed one will mean they use different sync branches for a deep branch, and so they may stop syncing until the old one is upgraded. However, that's only a problem when syncing between repositories without going via a central bare repository. Added a warning about this to the CHANGELOG, but it's probably not going to affect many people at all. This commit was sponsored by Riku Voipio.
\| *	Added a comment: Pre Commit Hook	interfect@b151490178830f44348aa57b77ad58c7d18e8fe7	2016-09-21
\| \|
* \|	improve comment	Joey Hess	2016-09-21
\| \|
* \|	bug	Joey Hess	2016-09-21
\|/
*	comments	Joey Hess	2016-09-21
\|
*	comment, retitle	Joey Hess	2016-09-21
\|
*	comment and close	Joey Hess	2016-09-21
\|
*	response	Joey Hess	2016-09-21
\|
*	comment	Joey Hess	2016-09-21
\|
*	comment	Joey Hess	2016-09-21
\|
*	lacking problem description	Joey Hess	2016-09-21
\|
*	close	Joey Hess	2016-09-21
\|
*	comment	Joey Hess	2016-09-21
\|
*	comment	Joey Hess	2016-09-21
\|
*	comment	Joey Hess	2016-09-21
\|
*	comment	Joey Hess	2016-09-21
\|
*	answer	Joey Hess	2016-09-21
\|
*	comment	Joey Hess	2016-09-21
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2016-09-21
\|\
* \|	update	Joey Hess	2016-09-21
\| \|