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

	Commit message (Collapse)	Author	Age
...
* \|	sync: fix crash on first sync when no branch exists yet	Joey Hess	2013-10-17
\| \|
\| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg	2013-10-17
\| \|
\| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM	2013-10-16
\|/
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2013-10-16
\|\
* \|	mini-devblog	Joey Hess	2013-10-16
\| \|
* \|	moreinfo	Joey Hess	2013-10-16
\| \|
\| *	Added a comment	http://joeyh.name/	2013-10-16
\| \|
\| *	Added a comment	http://joeyh.name/	2013-10-16
\|/
*	S3: Try to ensure bucket name is valid for archive.org.	Joey Hess	2013-10-16
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2013-10-16
\|\
* \|	test suite found a case that was not properly parsed	Joey Hess	2013-10-16
\| \|
* \|	close	Joey Hess	2013-10-16
\| \|
* \|	test case for a40e203f23a87bbc6d362d33734f1e4dcf645871	Joey Hess	2013-10-16
\| \|
* \|	fix indirect mode conflict merge when only one side is annexed file	Joey Hess	2013-10-16
\| \| \| \| \| \| \| \| \| \|	git-merge's creation of file~HEAD type files did not make this especially nice to do.
* \|	ensure merge directory is empty before starting merge	Joey Hess	2013-10-16
\| \| \| \| \| \| \| \|	Don't want some past failed merge to lead to bad results, potentially.
* \|	sync: Fix automatic resolution of merge conflicts where one side is an ↵	Joey Hess	2013-10-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	annexed file, and the other side is a non-annexed file, or a directory. Note that this case is only fully automatically resolved in direct mode. In indirect mode, git merge moves the file to file~HEAD, and replaces it with the directory, and leaves the file in unmerged state, and sync doesn't yet change that.
\| *	Added a comment	http://joeyh.name/	2013-10-16
\| \|
* \|	sheesh	Joey Hess	2013-10-16
\| \|
\| *	Added a comment	http://joeyh.name/	2013-10-16
\|/
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2013-10-16
\|\
* \|	tighten file2key to not produce invalid keys with no keyName	Joey Hess	2013-10-16
\| \| \| \| \| \| \| \| \| \| \| \|	A file named "foo-" or "foo-bar" was taken as a key's file, with a backend of "foo", and an empty keyName. This led to various problems, especially because converting that key back to a file did not yeild the same filename.
\| *	Added a comment: adding ssh server	https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo	2013-10-16
\|/
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2013-10-16
\|\
* \|	move another bug report out of forum	Joey Hess	2013-10-16
\| \|
\| *	Added a comment	http://joeyh.name/	2013-10-16
\|/
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2013-10-16
\|\
* \|	fix off-by-one	Joey Hess	2013-10-16
\| \|
\| *	Added a comment	http://joeyh.name/	2013-10-16
\| \|
\| *	Added a comment	http://joeyh.name/	2013-10-16
\|/
*	Added a comment	http://joeyh.name/	2013-10-16
\|
*	Added a comment	http://joeyh.name/	2013-10-16
\|
*	fix inclusion of -gitrev	Joey Hess	2013-10-16
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2013-10-16
\|\
* \|	Work around sed output difference that led to version containing a newline ↵	Joey Hess	2013-10-16
\| \| \| \| \| \| \| \|	on OSX.
\| *	Added a comment: Re: comment 10	fmarier	2013-10-16
\| \|
\| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawkdiXn5s1wX2Zncy1S7_h-yPTv2gt0bmmY	2013-10-16
\| \|
\| *	removed	https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U	2013-10-16
\| \|
\| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U	2013-10-16
\| \|
\| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U	2013-10-16
\| \|
\| *	(no commit message)	orb	2013-10-16
\| \|
\| *	Added a comment: details about my problem	https://www.google.com/accounts/o8/id?id=AItOawmCzVCPjgg_Un_114P8iiSwExms0G2csCA	2013-10-15
\| \|
\| *	removed	https://www.google.com/accounts/o8/id?id=AItOawmCzVCPjgg_Un_114P8iiSwExms0G2csCA	2013-10-15
\| \|
\| *	Added a comment: details about my problem	https://www.google.com/accounts/o8/id?id=AItOawmCzVCPjgg_Un_114P8iiSwExms0G2csCA	2013-10-15
\| \|
\| *	Added a comment: What am I missing?	https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo	2013-10-15
\| \|
\| *	Added a comment: More info on latest autobuild	bla	2013-10-15
\| \|
\| *	Added a comment: Testing	bla	2013-10-15
\|/
*	devblog	Joey Hess	2013-10-15
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2013-10-15
\|\
* \|	Deal with git check-attr -z output format change in git 1.8.5.	Joey Hess	2013-10-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I have not actually tested with 1.8.5, which is not yet relesaed, but git.git commit f7cd8c50b9ab83e084e8f52653ecc8d90665eef2 changes -z to also apply to output, without regards to back-compat. (But with pretty good reasons.) New code should work with both versions, by fingerprinting for NULs and newlines.
\| *	Added a comment: be aware of the 2-step verification	https://www.google.com/accounts/o8/id?id=AItOawkr_EUIHZ8CTtOGm-j-guMBzaYuOzrXJwg	2013-10-15
\| \|