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

	Commit message (Expand)	Author	Age
*	improve thread termination handling	Joey Hess	2012-06-28
*	tweak	Joey Hess	2012-06-28
*	merge conflict resolution now working	Joey Hess	2012-06-27
*	actually fetch from remote when doing a manual pull	Joey Hess	2012-06-27
*	automatic conflict resolution for assistant	Joey Hess	2012-06-27
*	Merge branch 'master' into assistant	Joey Hess	2012-06-27
\|\
\| *	typo	Joey Hess	2012-06-27
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus	2012-06-27
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus	2012-06-27
\| *	typo	Joey Hess	2012-06-27
\| *	blog for the day	Joey Hess	2012-06-27
* \|	Merge branch 'master' into assistant	Joey Hess	2012-06-27
\|\\|
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-06-27
\| \|\
\| * \	Merge branch 'automerge'	Joey Hess	2012-06-27
\| \|\ \
\| \| * \|	use "variant" rather than "version"	Joey Hess	2012-06-27
\| \| * \|	better filenames for conflict resolution files	Joey Hess	2012-06-27
\| \| * \|	commit merge resolution	Joey Hess	2012-06-27
\| \| * \|	fix file name	Joey Hess	2012-06-27
\| * \| \|	close	Joey Hess	2012-06-27
\| \| * \|	don't automerge when the symlinks cannot be parsed as keys	Joey Hess	2012-06-27
\| \| * \|	sync: Automatically resolves merge conflicts.	Joey Hess	2012-06-27
\| \| * \|	properly handle deleted files when processing ls-files --unmerged	Joey Hess	2012-06-27
\| \|/ /
\| * \|	add ls-files --unmerged support	Joey Hess	2012-06-27
\| \| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg	2012-06-27
\| \| *	Added a comment	http://joeyh.name/	2012-06-27
\| \| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE	2012-06-27
\| \| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus	2012-06-27
\| \| *	Added a comment	http://joeyh.name/	2012-06-27
\| \|/
\| *	git-config fileEncoding	Joey Hess	2012-06-26
\| *	Got rid of the last place that did utf8 decoding.	Joey Hess	2012-06-26
\| *	Added a comment	http://joeyh.name/	2012-06-27
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-06-26
\| \|\
* \| \|	Merge branch 'master' into assistant	Joey Hess	2012-06-26
\|\\| \|
\| * \|	Better fix for unavailable local remotes	Joey Hess	2012-06-26
\| \| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg	2012-06-27
\| \|/
\| *	blog for the day	Joey Hess	2012-06-26
* \|	use a TMVar	Joey Hess	2012-06-26
* \|	Merge branch 'master' into assistant	Joey Hess	2012-06-26
\|\\|
\| *	Avoid ugly failure mode when moving content from a local repository that is n...	Joey Hess	2012-06-26
\| *	new bug I noticed	Joey Hess	2012-06-26
* \|	better data type for push records	Joey Hess	2012-06-26
* \|	Merge branch 'master' into assistant	Joey Hess	2012-06-26
\|\\|
\| *	Version build dependency on STM, and allow building without it, which disable...	Joey Hess	2012-06-26
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670	2012-06-26
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670	2012-06-26
\| *	blog for the day	Joey Hess	2012-06-25
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-06-25
\| \|\
* \| \|	fixup merges now done when needed	Joey Hess	2012-06-25
* \| \|	Merge branch 'master' into assistant	Joey Hess	2012-06-25
\|\\| \|
* \| \|	add a push retry thread	Joey Hess	2012-06-25