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

	Commit message (Collapse)	Author	Age
*	avoid withWorkTreeRelated affecting annex symlink calculation	Joey Hess	2016-04-08
\|
*	one little bug..	Joey Hess	2016-04-06
\|
*	fix auto merge conflict resolution when doing out of tree merge for adjusted ↵	Joey Hess	2016-04-06
\| \| \| \|	branch
*	new method for merging changes into adjusted branch that avoids unncessary ↵	Joey Hess	2016-04-06
\| \| \| \| \| \|	merge conflicts Still needs work when there are actual merge conflicts.
*	Added a comment	szrc	2016-04-05
\|
*	response	Joey Hess	2016-04-04
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2016-04-04
\|\
\| *	Clarified CHECKURL-MULTI syntax	0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730	2016-04-04
\| \|
* \|	todo	Joey Hess	2016-04-04
\|/
*	still bug with sync in adjusted branch	Joey Hess	2016-04-04
\|
*	deal with cloning a repo that has an ajdusted branch checked out	Joey Hess	2016-04-04
\|
*	update	Joey Hess	2016-04-04
\|
*	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2016-04-04
\|\
* \|	Upgrading a direct mode repository to v6 has changed to enter an adjusted ↵	Joey Hess	2016-04-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unlocked branch. This makes the direct mode to v6 upgrade able to be performed in one clone of a repository without affecting other clones, which can continue using v5 and direct mode.
\| *	Added a comment: Local storage of creds	szrc	2016-04-04
\|/
*	remove old bug	Joey Hess	2016-03-31
\| \| \| \|	I just fixed this one today; it was not the problem I thought it was.
*	fixed merging of changes from adjusted branch + a remote	Joey Hess	2016-03-31
\|
*	made some progress on syncing adjusted branches, but still buggy	Joey Hess	2016-03-31
\|
*	todo	Joey Hess	2016-03-29
\|
*	todo	Joey Hess	2016-03-29
\|
*	prevent git-annex adjust changing things out from under the daemon	Joey Hess	2016-03-29
\|
*	update	Joey Hess	2016-03-29
\|
*	git annex add in adjusted unlocked branch	Joey Hess	2016-03-29
\| \| \| \| \|	Cached the current branch lookup just because it seems unnecessary overhead to run an extra git command per add to query the current branch.
*	updae	Joey Hess	2016-03-29
\|
*	Merge branch 'master' into adjustedbranch	Joey Hess	2016-03-29
\|\
\| *	poll vote (Same as for regular git-annex. ~/annex/)	185.16.53.225	2016-03-24
\| \|
\| *	comment	Joey Hess	2016-03-14
\| \|
\| *	rename files containing :	Joey Hess	2016-03-12
\| \| \| \| \| \| \| \| \| \| \| \|	This is mostly to let the repo check out on windows w/o using cygwin's git. But, bash completion is also crap with : , so ..
* \|	update	Joey Hess	2016-03-11
\| \|
* \|	simplify	Joey Hess	2016-03-11
\| \|
* \|	improve propigation of commits from adjusted branches	Joey Hess	2016-03-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only reverse adjust the changes in the commit, which means that adjustments do not need to be generally cleanly reversable. For example, an adjustment can unlock all locked files, but does not need to worry about files that were originally unlocked when reversing, because it will only ever be run on files that have been changed. So, it's ok if it locks all files when reversed, or even leaves all files as-is when reversed.
* \|	Merge branch 'master' into adjustedbranch	Joey Hess	2016-03-11
\|\\|
\| *	thought on reversing commits to adjusted branch	Joey Hess	2016-03-04
\| \|
* \|	working toward adjusted commit propigation	Joey Hess	2016-03-03
\| \|
* \|	can't checkout adjusted branch while index is still locked	Joey Hess	2016-03-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's a race here, but entering an adjusted branch for the first time is not something to do when a commit is being made at the same time. Although, may want to prevent the assistant from committing while entering the adjusted branch.
* \|	need to update master	Joey Hess	2016-02-29
\| \|
* \|	note a bug	Joey Hess	2016-02-29
\|/
*	Added a comment: would it be possible to get a branch only with annexed content?	https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4	2016-02-25
\|
*	updates	Joey Hess	2016-02-23
\|
*	updates	Joey Hess	2016-02-22
\|
*	updates	Joey Hess	2016-02-22
\|
*	poll vote (My phone (or MP3 player))	84.142.108.233	2016-02-17
\|
*	update	Joey Hess	2016-02-09
\|
*	update	Joey Hess	2016-02-09
\|
*	cleanu	Joey Hess	2016-02-09
\|
*	simplify; no need for separate filter reversal function	Joey Hess	2016-02-09
\|
*	improve	Joey Hess	2016-02-09
\|
*	improve api, removing IO	Joey Hess	2016-02-09
\|
*	add RenameFile	Joey Hess	2016-02-09
\|
*	update	Joey Hess	2016-02-09
\|