git-annex

Author	SHA1	Message	Date
Richard Hartmann	b11d88dd17	doc/: s/amoung/among/gi Qouth ye olde [Wiktionary](http://en.wiktionary.org/wiki/amoung) Archaic spelling of among.	2013-12-18 22:09:18 +01:00
Joey Hess	c7a1690f02	update	2011-06-22 17:56:07 -04:00
Joey Hess	c835166a7c	add git-union-merge This is a new git subcommand, that does a generic union merge operation between two refs, storing the result in a branch. It operates efficiently without touching the working tree. It does need to write out a temporary index file, and may need to write out some other temp files as well. This could be useful for anything that stores data in a branch, and needs to merge changes into that branch without actually checking the branch out. Since conflict handling can't be done without a working copy, the merge type is always a union merge, which is fine for data stored in log format (as git-annex does), or in non-conflicting files (as pristine-tar does). This probably belongs in git proper, but it will live in git-annex for now. --- Plan is to move .git-annex/ to a git-annex branch, and use git-union-merge to handle merging changes when pulling from remotes. Some preliminary benchmarking using real .git-annex/ data indicates that it's quite fast, except for the "git add" call, which is as slow as "git add" tends to be with a big index.	2011-06-20 21:37:18 -04:00
Joey Hess	91e50782ce	thought	2011-06-20 21:37:18 -04:00
Joey Hess	2fcb8e3b11	update	2011-06-20 21:37:18 -04:00
Joey Hess	e593a81041	update	2011-06-20 21:37:18 -04:00
Joey Hess	fdf1c64812	notes	2011-04-09 11:13:01 -04:00
Joey Hess	079e57adf7	current thoughts	2011-04-07 12:33:48 -04:00
Joey Hess	c305fb2bf3	thought	2010-11-15 15:21:11 -04:00
Joey Hess	40ae21c895	this is looking more and more problimatic	2010-11-15 14:00:28 -04:00
Joey Hess	0e1e32cb6b	problem	2010-11-15 13:13:01 -04:00
Joey Hess	3a5efc54d0	fullfledged design for moving location tracking info into branches	2010-11-12 11:00:20 -04:00
Joey Hess	81f71e57b9	reorg	2010-10-25 11:47:45 -04:00

13 commits