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

	Commit message (Collapse)	Author	Age
*	typo	Joey Hess	2012-06-27
\|
*	blog for the day	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While this word may be less familiar to some users, it avoids the connotation that version 2 is better than version 1, which is wrong when the two variants were conflicting.
\| * \|	better filenames for conflict resolution files	Joey Hess	2012-06-27
\| \| \|
\| * \|	commit merge resolution	Joey Hess	2012-06-27
\| \| \| \| \| \| \| \| \| \| \| \|	this is necessary so the sync can continue successfully with its push phase
\| * \|	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
\| \| \| \| \| \| \| \| \| \| \| \|	untested, but it compiles :)
\| * \|	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
\| \| \| \| \| \| \| \| \| \| \| \|	Accept arbitrarily encoded repository filepaths etc when reading git config output. This fixes support for remotes with unusual characters in their names. For example, a remote with a url of /tmp/çüş was previously skipped, because the filename wasn't encoded right so it didn't think it was available. And when setting the annex-uuid of a remote named "çüş", it used to add it under a mis-encoded form of the remote's name. Both these cases now work ok in my testing.
*	Got rid of the last place that did utf8 decoding.	Joey Hess	2012-06-26
\| \| \| \| \|	Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/ although I don't know how to reproduce that bug.
*	Added a comment	http://joeyh.name/	2012-06-27
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-06-26
\|\
* \|	Better fix for unavailable local remotes	Joey Hess	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \|	Not including such remotes turned out to have other consequences, including annex-truselevel git config being ignored. Instead, add guards before each operation that might try to operate on such a repo.
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg	2012-06-27
\|/
*	blog for the day	Joey Hess	2012-06-26
\|
*	Avoid ugly failure mode when moving content from a local repository that is ↵	Joey Hess	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not available. Prelude.undefined error message was introduced by bb4f31a0ee496ffb83d31cc56f8827e47605d763. It seems best to filter out local repositories that cannot be accessed from the list of remotes, rather than keeping them in and making every thing that uses the list have to deal with remotes that may have an unknown location. Besides fixing the error message, this also makes unavailable local remotes' names not be shown in various messages, including in git annex status output. Also, move --to an unavailable local repository now avoids some ugly errors like "changeWorkingDirectory: does not exist".
*	new bug I noticed	Joey Hess	2012-06-26
\|
*	Version build dependency on STM, and allow building without it, which ↵	Joey Hess	2012-06-26
\| \| \| \|	disables the watch command.
*	(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
\|\
\| *	Added a comment	http://joeyh.name/	2012-06-25
\| \|
\| *	Added a comment	http://joeyh.name/	2012-06-25
\| \|
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus	2012-06-25
\| \|
\| *	Added a comment	http://joeyh.name/	2012-06-25
\| \|
* \|	cabal: Only try to use inotify on Linux.	Joey Hess	2012-06-25
\| \|
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus	2012-06-25
\| \|
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus	2012-06-25
\| \|
\| *	Added a comment	http://joeyh.name/	2012-06-25
\| \|
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus	2012-06-25
\| \|
\| *	Added a comment: For the moment	https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE	2012-06-25
\| \|
\| *	Added a comment: Installation not working on OS X 10.6.8	https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE	2012-06-25
\| \|
\| *	Added a comment: The fact that the keys changed causes merge conflicts	https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I	2012-06-25
\| \|
* \|	typo	Joey Hess	2012-06-24
\|/
*	add news item for git-annex 3.20120624	Joey Hess	2012-06-24
\|
*	releasing version 3.201206243.20120624	Joey Hess	2012-06-24
\|
*	Added a comment	http://joeyh.name/	2012-06-23
\|
*	fixed	Joey Hess	2012-06-23
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-06-23
\|\