Joey Hess 6d71a9b68e mention automatic merge conflict resolution		2013-07-09 14:22:54 -04:00
..
Android
android
assistant	Added a comment: Ooh. Do want on Windows	2013-07-03 20:44:05 +00:00
backends
bare_repositories
bugs	Make --numcopies override annex.numcopies set in .gitattributes.	2013-07-09 12:05:56 -04:00
design	Added a comment	2013-07-09 13:48:50 +00:00
direct_mode	Added a comment	2013-07-08 16:11:32 +00:00
download
encryption
footer
forum	Added a comment	2013-07-08 23:27:45 +00:00
install	add a step to make sure that $HOME/bin exists - this tripped me up.	2013-07-08 07:20:04 +00:00
internals
license
links	add	2013-06-26 14:45:12 -04:00
news	add news item for git-annex 4.20130627	2013-06-27 14:59:51 -04:00
not
preferred_content
special_remotes	Added a comment	2013-07-09 10:54:58 +00:00
sync
templates
tips	fix	2013-07-04 15:48:28 +00:00
todo	Merge branch 'master' of ssh://git-annex.branchable.com	2013-07-07 14:13:33 -04:00
upgrades
use_case
users
videos	downloads.kitenet.net now supports https; use it for all links	2013-06-26 19:21:19 -04:00
walkthrough	wording	2013-07-08 16:27:00 -04:00
Android.mdwn
assistant.mdwn
backends.mdwn
bare_repositories.mdwn	update docs for --all	2013-07-03 14:16:01 -04:00
bugs.mdwn	assistant bugs are shown in the main bug list, fix a note that says	2013-07-04 20:56:37 -04:00
coding_style.mdwn
comments.mdwn
contact.mdwn
copies.mdwn
design.mdwn
direct_mode.mdwn
distributed_version_control.mdwn
download.mdwn
encryption.mdwn
favicon.ico
feeds.mdwn
forum.mdwn
future_proofing.mdwn
git-annex-shell.mdwn
git-annex.mdwn	merge: Now also merges synced/master or similar branches, which makes it useful to put in a post-receive hook to make a repository automatically update its working copy when git annex sync or the assistant sync with it.	2013-07-03 15:42:56 -04:00
git-union-merge.mdwn
how_it_works.mdwn
index.mdwn
install.mdwn
internals.mdwn
license.mdwn
location_tracking.mdwn
logo-bw.svg
logo.png
logo.svg
logo_small.png
meta.mdwn
news.mdwn
not.mdwn
preferred_content.mdwn
privacy.mdwn	downloads.kitenet.net now supports https; use it for all links	2013-06-26 19:21:19 -04:00
related_software.mdwn
repomap.png
scalability.mdwn
sidebar.mdwn
sitemap.mdwn
special_remotes.mdwn
summary.mdwn
sync.mdwn	mention automatic merge conflict resolution	2013-07-09 14:22:54 -04:00
testimonials.mdwn	update	2013-06-27 02:33:17 -04:00
tips.mdwn
todo.mdwn
transferring_data.mdwn
trust.mdwn
upgrades.mdwn
users.mdwn
videos.mdwn
walkthrough.mdwn	typo	2013-07-08 16:24:21 -04:00