diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-17 16:44:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-17 16:44:33 -0400 |
| commit | 56640cc7e2a74cfda4c45250d7778357ca3896a9 (patch) | |
| tree | 76b6fa262878167948f5115468ef0e44eac82eec /doc | |
| parent | e0b7351f64e6b8100d2109b99322bf9ab9f59a23 (diff) | |
| parent | e4194ded1c4a4159495bf97b331535fcedfc0ddf (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/bugs/3.20121112:_build_error_in_assistant/comment_1_b42f40ffd83321ab5cc0ef24ced15e98._comment b/doc/bugs/3.20121112:_build_error_in_assistant/comment_1_b42f40ffd83321ab5cc0ef24ced15e98._comment new file mode 100644 index 000000000..9690885f0 --- /dev/null +++ b/doc/bugs/3.20121112:_build_error_in_assistant/comment_1_b42f40ffd83321ab5cc0ef24ced15e98._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.252.11.120" + subject="comment 1" + date="2012-11-17T20:21:12Z" + content=""" +This looks rather like a bug in Yesod. I've made a change in git (b0a76592c313b4c8f51918d6469c40d1fd16a2b1) that *may* avoid the problem. +"""]] diff --git a/doc/forum/Push__47__Pull_with_the_Assistant/comment_1_f7b63d379c2d21794adf8658f546f8a7._comment b/doc/forum/Push__47__Pull_with_the_Assistant/comment_1_f7b63d379c2d21794adf8658f546f8a7._comment new file mode 100644 index 000000000..0477218bc --- /dev/null +++ b/doc/forum/Push__47__Pull_with_the_Assistant/comment_1_f7b63d379c2d21794adf8658f546f8a7._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.252.11.120" + subject="comment 1" + date="2012-11-17T20:25:03Z" + content=""" +The assistant will push, pull, and merge the master and git-annex branches (which is exactly what git annex sync does). + +Additionally, the assistant will transfer file contents to the bare repository, either to make it have a copy of everything, or as needed to transfer to other repositories that also use that bare repository. This behavior is configurable using the webapp. +"""]] |