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

	Commit message (Collapse)	Author	Age
*	Added a comment	http://joeyh.name/	2014-07-09
\|
*	more info	Joey Hess	2014-07-09
\|
*	bug	Joey Hess	2014-07-09
\|
*	(no commit message)	http://ypid.wordpress.com/	2014-07-09
\|
*	new bug gpg does not ask for password inside tmux	http://svario.it/gioele	2014-07-09
\|
*	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8	2014-07-09
\|
*	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8	2014-07-09
\|
*	Added a comment: Same happening here	https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8	2014-07-09
\|
*	(no commit message)	http://mildred.fr/	2014-07-09
\|
*	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawnu1NjsjNS3m0OxiYLKO-5SKNpSERxpi6k	2014-07-09
\|
*	Added a comment	zardoz	2014-07-09
\|
*	Added a comment	zardoz	2014-07-09
\|
*	(no commit message)	zardoz	2014-07-09
\|
*	Added a comment	zardoz	2014-07-09
\|
*	Added a comment	http://olivier.mehani.name/	2014-07-09
\|
*	Added a comment	EskildHustvedt	2014-07-09
\|
*	Reopening	EskildHustvedt	2014-07-09
\|
*	Added a comment: It works now	https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE	2014-07-08
\|
*	Added a comment: package in debian backports shows the same error mesage	https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao	2014-07-08
\|
*	Added a comment	zardoz	2014-07-08
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2014-07-08
\|\
* \|	Fix bug in automatic merge conflict resolution	Joey Hess	2014-07-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When one side is an annexed symlink, and the other side is a non-annexed symlink. In this case, git-merge does not replace the annexed symlink in the work tree with the non-annexed symlink, which is different from it's handling of conflicts between annexed symlinks and regular files or directories. So, while git-annex generated the correct merge commit, the work tree didn't get updated to reflect it. See comments on bug for additional analysis. Did not add this to the test suite yet; just unloaded a truckload of firewood and am feeling lazy. This commit was sponsored by Adam Spiers.
\| *	Added a comment: analysis	http://joeyh.name/	2014-07-08
\| \|
\| *	Added a comment	http://joeyh.name/	2014-07-08
\| \|
\| *	(no commit message)	zardoz	2014-07-08
\|/
*	confirmed	Joey Hess	2014-07-08
\|
*	fixed	Joey Hess	2014-07-08
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2014-07-08
\|\
\| *	Added a comment	http://joeyh.name/	2014-07-08
\| \|
* \|	update month	Joey Hess	2014-07-08
\| \|
\| *	(no commit message)	https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8	2014-07-08
\| \|
\| *	(no commit message)	zardoz	2014-07-08
\| \|
\| *	Added a comment	zardoz	2014-07-08
\| \|
\| *	(no commit message)	CandyAngel	2014-07-08
\| \|
\| *	Added a comment	EskildHustvedt	2014-07-08
\| \|
\| *	(no commit message)	divB	2014-07-08
\| \|
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns	2014-07-08
\| \|
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE	2014-07-08
\| \|
\| *		feulif	2014-07-07
\|/
*	devblog	Joey Hess	2014-07-07
\|
*	android version	Joey Hess	2014-07-07
\|
*	fix heights	Joey Hess	2014-07-07
\|
*	fix heights	Joey Hess	2014-07-07
\|
*	fix heights	Joey Hess	2014-07-07
\|
*	fix heights	Joey Hess	2014-07-07
\|
*	fix heights	Joey Hess	2014-07-07
\|
*	fix heights	Joey Hess	2014-07-07
\|
*	reorg	Joey Hess	2014-07-07
\|
*	fix	Joey Hess	2014-07-07
\|
*	add display of build-version files	Joey Hess	2014-07-07
\|