Joey Hess e27b97d364 Merge branch 'master' into concurrentprogress ... Conflicts: Command/Fsck.hs Messages.hs Remote/Directory.hs Remote/Git.hs Remote/Helper/Special.hs Types/Remote.hs debian/changelog git-annex.cabal		2015-05-12 13:23:22 -04:00
..
GitAnnex	get, move, copy, mirror: Concurrent downloads and uploads are now supported!	2015-04-10 17:08:07 -04:00
GitAnnexShell	update my email address and homepage url	2015-01-21 12:50:09 -04:00
Action.hs	Merge branch 'master' into concurrentprogress	2015-05-12 13:23:22 -04:00
Batch.hs	contentlocation, examinekey, lookupkey: Added --batch mode option.	2015-05-06 13:44:53 -04:00
GitAnnex.hs	required: New command, like wanted, but for required content.	2015-04-18 16:04:35 -04:00
GitAnnexShell.hs	git-annex-shell: Improve error message when the specified repository doesn't exist or git config fails for some reason.	2015-03-05 21:45:42 -04:00
Option.hs	--auto is no longer a global option; only get, drop, and copy accept it.	2015-03-25 17:06:14 -04:00
Seek.hs	Merge branch 'master' into concurrentprogress	2015-05-12 13:23:22 -04:00
Usage.hs	update my email address and homepage url	2015-01-21 12:50:09 -04:00