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

	Commit message (Collapse)	Author	Age
*	releasing version 3.201112313.20111231	Joey Hess	2011-12-31
\|
*	add section on syncing to the walkthrough	Joey Hess	2011-12-31
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2011-12-31
\|\
\| *	Added a comment	http://joey.kitenet.net/	2011-12-31
\| \|
* \|	Merge branch 'autosync'	Joey Hess	2011-12-31
\|\ \ \| \|/ \|/\|
* \|	Added a comment	http://joey.kitenet.net/	2011-12-31
\| \|
\| *	skip local remotes that are not available (ie, not mounted)	Joey Hess	2011-12-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	With --fast, unavailable local remotes are filtered out of the fast set. This way, if there are local remotes, --fast always acts only on them, and if none are mounted, acts on nothing. This consistency is better than --fast acting on different remotes depending on what's mounted.
\| *	type alias	Joey Hess	2011-12-31
\| \|
\| *	fix comment	Joey Hess	2011-12-31
\| \|
\| *	type alias cleanup	Joey Hess	2011-12-31
\| \|
\| *	refactor and check for a detached HEAD	Joey Hess	2011-12-31
\| \|
\| *	better filtering out of special remotes	Joey Hess	2011-12-31
\| \|
\| *	never pick special remotes in --fast	Joey Hess	2011-12-31
\| \| \| \| \| \| \| \|	even if they have the lowest cost, we cannot use them
\| *	remove unnecessary check	Joey Hess	2011-12-31
\| \| \| \| \| \| \| \| \| \|	mergeLocal always creates the local sync branch, so no need to check that it exists later.
\| *	refactor	Joey Hess	2011-12-31
\| \|
\| *	really fix check that remote needs merged	Joey Hess	2011-12-31
\| \|
\| *	tweak	Joey Hess	2011-12-31
\| \|
\| *	tweak	Joey Hess	2011-12-31
\| \|
\| *	fix check that remote branch needs merged	Joey Hess	2011-12-31
\| \|
\| *	minor cleanups	Joey Hess	2011-12-31
\| \| \| \| \| \| \| \|	mergeFrom is never called on branches that don't exist anymore
\| *	avoid syncing remotes configured annex-ignore, unless explicitly specified	Joey Hess	2011-12-31
\| \|
* \|	Added a comment: ssh://gitolite-host/repo-name is supposed to work	bremner	2011-12-31
\| \|
* \|	Added a comment: gitolite gets different paths for different urls	bremner	2011-12-31
\| \|
\| *	sync --fast: Selects some of the remotes with the lowest annex.cost and ↵	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \|	syncs those, in addition to any specified at the command line.
\| *	update	Joey Hess	2011-12-30
\| \|
\| *	Merge branch 'master' into autosync	Joey Hess	2011-12-30
\| \|\ \| \|/ \|/\|
* \|	typo	Joey Hess	2011-12-30
\| \|
* \|	Added a comment	http://joey.kitenet.net/	2011-12-31
\| \|
* \|	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2011-12-30
\|\ \
* \| \|	increate spec-constr-count	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \|	Was getting SpecConstr warnings on Command.Find
* \| \|	Merge branch 'new-monad-control'	Joey Hess	2011-12-30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: debian/changelog
\| \| \| *	add a sync page documenting sync in detail	Joey Hess	2011-12-30
\| \| \| \|
\| \| * \|	Added a comment	http://joey.kitenet.net/	2011-12-30
\| \| \| \|
\| \| \| *	improve description of sync	Joey Hess	2011-12-30
\| \| \| \|
\| \| \| *	push when git-annex branch changed	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I was too heavy-handed in optimising away pushes
\| \| \| *	automated syncing	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some changes to make automated syncing nicer. Merge from both the remote's $branch and its synced/$branch; either could have new changes. Create synced/$branch on the remote when pushing.
\| \| \| *	export remoteList	Joey Hess	2011-12-30
\| \| \| \|
\| \| \| *	automatically create the syncbranch	Joey Hess	2011-12-30
\| \| \| \|
\| \| \| *	refactor	Joey Hess	2011-12-30
\| \| \| \|
\| \| \| *	refactor	Joey Hess	2011-12-30
\| \| \| \|
\| \| \| *	check that synced/master exists before trying to use it	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and a nice error message if syncing is not set up yet
\| \| \| *	check if branches are up-to-date before merging, pushing	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This optimises away the need to run anything in some common cases. It's particularly useful on push; no need to push if the tracking branch we just pulled is the same as the branch we're going to push.
\| \| \| *	improve wording	Joey Hess	2011-12-30
\| \| \| \|
\| \| * \|	Added a comment	http://joey.kitenet.net/	2011-12-30
\| \| \| \|
\| \| * \|	Added a comment: repo name conventions?	bremner	2011-12-30
\| \|/ / \|/\| \|
\| \| *	message cleanup	Joey Hess	2011-12-30
\| \| \|
\| \| *	avoid using Git.Ref.describe except for when generating user messages	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The other uses of it can all be simplified using Git.Ref.base, Git.Ref.under, and show. In some cases, describe was being used to shorten the branch name unnecessarily, and I instead pass the fully qualified name to git.
\| \| *	add base, under	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The describe function was only intended to generate a human-visible description of a branch, but taking the base of a branch is a useful operation to be able to do no matter the human-visible representation. Converting a branch like refs/heads/master to refs/heads/origin/master is also a useful operation, and under can do that.
\| \| *	update to my indentation style	Joey Hess	2011-12-30
\| \| \|
\| \| *	force git-annex branch update after fetching remotes	Joey Hess	2011-12-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-annex normally only runs the branch update once per run, for speed, but since this fetches new remote git-annex tracking branches, they need to be merged in after that fetch. An earlier call to Remote.byName was causing the update to run before the fetch sometimes, but it could have been anything. Just force the update to happen in the right place.