Joey Hess 8a8380f1b7 use sync command merge engine in assistant ... To handle direct mode merging.		2012-12-25 14:10:07 -04:00
..
assistant	adjust version	2012-12-11 12:28:50 -04:00
backends
bare_repositories
bugs	Added a comment	2012-12-23 19:51:53 +00:00
design	use sync command merge engine in assistant	2012-12-25 14:10:07 -04:00
download
encryption
forum		2012-12-22 16:55:37 +00:00
install	adjust path for logs	2012-12-21 15:06:22 -04:00
internals	document the key format	2012-11-30 16:01:29 -04:00
license
news	add news item for git-annex 3.20121211	2012-12-11 12:29:25 -04:00
not
preferred_content	Added a comment	2012-12-11 16:03:04 +00:00
special_remotes	Added a comment	2012-12-01 21:14:34 +00:00
sync
templates
tips	move tip from forum to tips	2012-12-17 12:43:08 -04:00
todo	Added a comment	2012-12-01 19:31:18 +00:00
upgrades
use_case
users
walkthrough
assistant.mdwn
backends.mdwn
bare_repositories.mdwn
bugs.mdwn	improve pagespec	2012-12-19 14:28:45 -04:00
coding_style.mdwn
comments.mdwn
contact.mdwn
contributing.mdwn
copies.mdwn
design.mdwn
direct_mode.mdwn	added direct and indirect commands	2012-12-13 15:44:56 -04:00
distributed_version_control.mdwn
download.mdwn
encryption.mdwn
favicon.ico
feeds.mdwn
forum.mdwn
future_proofing.mdwn
git-annex-shell.mdwn
git-annex.mdwn	added direct and indirect commands	2012-12-13 15:44:56 -04:00
git-union-merge.mdwn
how_it_works.mdwn
index.mdwn	link to direct_mode	2012-12-13 16:09:33 -04:00
install.mdwn	OSX Mountian Lion builds now available	2012-12-17 12:59:18 -04:00
internals.mdwn	document the key format	2012-11-30 16:01:29 -04:00
license.mdwn
location_tracking.mdwn
logo-bw.svg
logo.png
logo.svg
logo_small.png
meta.mdwn
news.mdwn
not.mdwn
preferred_content.mdwn	fix preferred content definition for the backup group	2012-12-10 15:44:58 -04:00
repomap.png
scalability.mdwn	typos	2012-12-09 21:59:14 +00:00
sitemap.mdwn
special_remotes.mdwn
summary.mdwn
sync.mdwn
testimonials.mdwn
tips.mdwn
todo.mdwn
transferring_data.mdwn
trust.mdwn
upgrades.mdwn
users.mdwn
walkthrough.mdwn