Joey Hess 4a847cdc08 finish fixing direct mode merge bug involving unstaged local files ... Added test cases for both ways this can happen, with a conflict involving a file, or a directory. Cleaned up resolveMerge to not touch the work tree in direct mode, which turned out to be the only way to handle things.. And makes it much nicer. Still need to run test suite on windows.		2014-03-04 02:03:15 -04:00
..
Android	Added a comment: where do I put the SSH keys on Android	2014-02-26 20:26:49 +00:00
android
assistant	prep release	2014-02-21 11:24:18 -04:00
automatic_conflict_resolution	Added a comment: Customise conflict resolution behaviour	2014-02-25 11:42:08 +00:00
backends	removed	2014-01-09 14:21:58 +00:00
bare_repositories
bugs	finish fixing direct mode merge bug involving unstaged local files	2014-03-04 02:03:15 -04:00
contact
copies
design	pre-commit-annex hook script to automatically extract metadata from lots of types of files	2014-03-02 20:11:58 -04:00
devblog	devblog	2014-03-02 20:22:04 -04:00
direct_mode
download
ekg
encryption
footer
forum	Added a comment: Didn't work	2014-03-01 22:40:37 +00:00
how_it_works	Added a comment: clarification about what is moved / stored and where	2014-02-10 12:53:44 +00:00
install	depend on warp-tls.. at least for now	2014-02-28 21:37:33 -04:00
internals	Added a comment	2014-01-31 00:45:48 +00:00
license
links	add thanks page	2014-01-10 15:23:58 -04:00
news	add news item for git-annex 5.20140227	2014-02-27 11:55:31 -04:00
not	Added a comment	2014-02-06 17:00:59 +00:00
polls
preferred_content
special_remotes	improve directory special remote docs	2014-02-02 15:26:33 -04:00
sync	Added a comment: Sorry to just be getting back...	2014-01-26 22:51:30 +00:00
templates
testimonials
tips	Added a comment	2014-03-03 07:44:30 +00:00
todo		2014-03-01 10:06:16 +00:00
upgrades
use_case
users		2013-12-31 10:29:05 +00:00
videos	https	2014-02-20 13:26:53 -04:00
walkthrough	update walkthrough	2014-02-20 14:48:09 -04:00
Android.mdwn
assistant.mdwn	add thanks page	2014-01-10 15:23:58 -04:00
automatic_conflict_resolution.mdwn
backends.mdwn
bare_repositories.mdwn
bugs.mdwn
builds.mdwn	no more OSX lion builds	2014-01-06 11:32:23 -04:00
coding_style.mdwn
comments.mdwn	remove comment posted directly to comments page	2014-02-01 15:05:21 -04:00
contact.mdwn
copies.mdwn	global numcopies setting	2014-01-20 16:47:56 -04:00
design.mdwn	use map	2014-02-11 16:35:52 -04:00
devblog.mdwn
direct_mode.mdwn
distributed_version_control.mdwn
download.mdwn
ekg.mdwn	add notes on full profiling	2014-01-05 19:53:41 -04:00
encryption.mdwn
favicon.ico
favicon.png
feeds.mdwn
forum.mdwn
future_proofing.mdwn
git-annex-shell.mdwn
git-annex.mdwn	pre-commit-annex hook script to automatically extract metadata from lots of types of files	2014-03-02 20:11:58 -04:00
git-union-merge.mdwn
how_it_works.mdwn	s/large/annexed/	2014-02-10 12:26:47 -04:00
index.mdwn	This reverts commit 75feae8092	2014-01-01 14:49:17 +00:00
install.mdwn
internals.mdwn	document more .git/annex/ contents	2014-02-26 17:04:03 -04:00
license.mdwn
location_tracking.mdwn
logo-old-bw.svg
logo-old.png
logo-old.svg
logo-old_small.png
logo.mdwn
logo.svg
logo_small.png
meta.mdwn
metadata.mdwn	pre-commit-annex hook script to automatically extract metadata from lots of types of files	2014-03-02 20:11:58 -04:00
news.mdwn
not.mdwn
polls.mdwn
preferred_content.mdwn	explicitly include unused files in backup and incremental backup	2014-01-23 16:36:15 -04:00
privacy.mdwn		2014-01-14 06:15:09 +00:00
publicrepos.mdwn	add link to tip	2014-01-07 12:59:16 -04:00
related_software.mdwn	add link to darktable-git-annex	2014-03-03 13:33:40 -04:00
repomap.png
scalability.mdwn
shortcuts.mdwn
sidebar.mdwn	remove hotlink to flattr icon	2014-01-16 12:01:49 -04:00
sitemap.mdwn
special_remotes.mdwn	add hubiC special remote	2014-02-11 13:35:30 +00:00
summary.mdwn
sync.mdwn	update docs for sync --content	2014-02-02 16:21:42 -04:00
testimonials.mdwn
thanks.mdwn	update	2014-01-12 23:23:26 -04:00
tips.mdwn
todo.mdwn
transferring_data.mdwn
trust.mdwn
upgrades.mdwn	update	2013-12-29 15:01:46 -04:00
users.mdwn
videos.mdwn
walkthrough.mdwn	add a walkthrough section discussing git-annex's skipping of files on noop	2014-02-02 17:01:41 -04:00