Merge branch 'master' of ssh://git-annex.branchable.com

7 files changed, 52 insertions, 1 deletions

diff --git a/doc/devblog/day_266-267__man_page_split/comment_2_63791201452a6ab30a35cd742434acca._comment b/doc/devblog/day_266-267__man_page_split/comment_2_63791201452a6ab30a35cd742434acca._comment
new file mode 100644
index 000000000..95bf5dde2
--- /dev/null
+++ b/doc/devblog/day_266-267__man_page_split/comment_2_63791201452a6ab30a35cd742434acca._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
+ nickname="Yaroslav"
+ subject="works like charm"
+ date="2015-03-31T02:29:04Z"
+ content="""
+THANKS!
+"""]]
diff --git a/doc/devblog/day_266-267__man_page_split/comment_3_d7764c605ad338c4bf4c4b46b54abd8a._comment b/doc/devblog/day_266-267__man_page_split/comment_3_d7764c605ad338c4bf4c4b46b54abd8a._comment
new file mode 100644
index 000000000..0e7f793bb
--- /dev/null
+++ b/doc/devblog/day_266-267__man_page_split/comment_3_d7764c605ad338c4bf4c4b46b54abd8a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
+ nickname="Yaroslav"
+ subject="comment 3"
+ date="2015-03-31T02:32:04Z"
+ content="""
+I only wish it was identical to git syntax (git COMMAND --help for manpage full doc, git COMMAND -h for short summary), but iirc I have whined before and it wasn't trivial to achieve.  So current one is next akin ;-) 
+"""]]
diff --git a/doc/devblog/day_268_stressed_out/comment_4_fecf179be92c3a3e25f4a47fcea6b6ec._comment b/doc/devblog/day_268_stressed_out/comment_4_fecf179be92c3a3e25f4a47fcea6b6ec._comment
new file mode 100644
index 000000000..f042f9394
--- /dev/null
+++ b/doc/devblog/day_268_stressed_out/comment_4_fecf179be92c3a3e25f4a47fcea6b6ec._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f"
+ nickname="g"
+ subject="SuperUser"
+ date="2015-03-31T01:09:20Z"
+ content="""
+Totally agree that the main developers, and especially you, Joey, shouldn't have to be handling most of the support you are now. There's already a reasonable amount of [git-annex-related action over on the SuperUser Stack Exchage](http://superuser.com/search?q=git-annex), though the actual [`git-annex` tag seems to only have been used once](http://superuser.com/questions/tagged/git-annex)
+
+Echoing #3, it does seem like it would make sense to move more of the basic support work over there from the forum. For this sort of Q&A, I find Stack Exchange a bit better structured, a little harder to miss past questions before re-posting, and like that it has a built-in community of people to help answer.
+"""]]
diff --git a/doc/forum/__34__du__34___equivalent_on_an_annex__63__/comment_8_6a51c22d9893fa5b1503f5a14b1eb8ce._comment b/doc/forum/__34__du__34___equivalent_on_an_annex__63__/comment_8_6a51c22d9893fa5b1503f5a14b1eb8ce._comment
new file mode 100644
index 000000000..349c145cd
--- /dev/null
+++ b/doc/forum/__34__du__34___equivalent_on_an_annex__63__/comment_8_6a51c22d9893fa5b1503f5a14b1eb8ce._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="comment 8"
+ date="2015-03-31T03:11:06Z"
+ content="""
+i have used the [symlink patch of ncdu](http://dev.yorhel.nl/ncdu/bug/16) with good results here...
+"""]]
diff --git a/doc/forum/gadu_-_git-annex_disk_usage.mdwn b/doc/forum/gadu_-_git-annex_disk_usage.mdwn
index c7a20c327..e4109a2cf 100644
--- a/doc/forum/gadu_-_git-annex_disk_usage.mdwn
+++ b/doc/forum/gadu_-_git-annex_disk_usage.mdwn
@@ -1,4 +1,4 @@
-Based on the thread over at <http://git-annex.branchable.com/forum/__34__du__34___equivalent_on_an_annex__63__/> I decided to finally write a du like utility for git-annex.  A 0.01 version is up over at <http://git-annex.mysteryvortex.com/git-annex-utils.html>.  It works, but I intend to make it smarter about handling git repos and annexed files, as well as adding more of the options available in the standard du utility.
+Based on the thread over at [[forum/__34__du__34___equivalent_on_an_annex__63__]] I decided to finally write a du like utility for git-annex.  A 0.01 version is up over at <http://git-annex.mysteryvortex.com/git-annex-utils.html>.  It works, but I intend to make it smarter about handling git repos and annexed files, as well as adding more of the options available in the standard du utility.
 
 Currently it will tally up the sizes of links that look like they are annexed files.  I plan to make it actually interact with git and git-annex to verify the files are annexed and enable options like tallying files only from specific remotes, only missing files, not double counting files which are annexed multiple times but stored only once, etc...
 
diff --git a/doc/forum/how_to_edit_the_git-annex_branch__63__.mdwn b/doc/forum/how_to_edit_the_git-annex_branch__63__.mdwn
new file mode 100644
index 000000000..a37391001
--- /dev/null
+++ b/doc/forum/how_to_edit_the_git-annex_branch__63__.mdwn
@@ -0,0 +1,9 @@
+as a followup to [[forum/remote-specific_meta-data/]], now i'm thinking of injecting data in the `git-annex` branch. i'm still a little hesitant because [[forum/optimising_lookupkey/]] mentions that i need to "delete or update `.git/annex/index`" when doing so. yet I also saw in the source code there is a `.git/annex/index.lock` file that is being used to avoid concurrent access to that file - is that something that should be watched out for? how do I manage that lockfile? is it mandatory to stage files into the index at first?
+
+maybe i'm just not familiar enough with how git operates internally myself. i've reviewed this section of the progit book again: http://git-scm.com/book/en/v2/Git-Internals-Git-Objects - and i feel i have again some handle on how to do those things, but it seems like a major hurdle to go through just to change a single setting in one git-annex metadata file... wouldn't `enableremote` be sufficient here? I figured to append custom fields to a remote, i could do:
+
+    git annex enableremote myremoteuuid "$(git cat-file -p git-annex:remote.log | grep myremoteuuid) extratag=true"
+
+Would that work at all? Should i operate directly on the git-annex branch myself instead?
+
+Thanks! --[[anarcat]]
diff --git a/doc/forum/remote-specific_meta-data/comment_2_51347629414ac42a6709d00d38ebef9c._comment b/doc/forum/remote-specific_meta-data/comment_2_51347629414ac42a6709d00d38ebef9c._comment
new file mode 100644
index 000000000..e49e2c7e6
--- /dev/null
+++ b/doc/forum/remote-specific_meta-data/comment_2_51347629414ac42a6709d00d38ebef9c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="remote.log or uuid.log?"
+ date="2015-03-31T04:29:49Z"
+ content="""
+`remote.log` is present only for \"special remotes\" - could i also use it for... well, \"non-special remotes\"? :) in other words, right now my `remote.log` is empty or even missing in most of the git-annex repos I used, because i don't use the special remotes so much. could i still store information in that file even though it's not being used by git-annex?
+
+or could i just use `uuid.log` instead, which is present for all types of remotes?
+"""]]