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

7 files changed, 131 insertions, 0 deletions

diff --git a/doc/bugs/OSX_app_issues/comment_12_f3bc5a4e4895ac9351786f0bdd8005ba._comment b/doc/bugs/OSX_app_issues/comment_12_f3bc5a4e4895ac9351786f0bdd8005ba._comment
new file mode 100644
index 000000000..131837277
--- /dev/null
+++ b/doc/bugs/OSX_app_issues/comment_12_f3bc5a4e4895ac9351786f0bdd8005ba._comment
@@ -0,0 +1,51 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmYiJgOvC4IDYkr2KIjMlfVD9r_1Sij_jY"
+ nickname="Douglas"
+ subject="Error creating remote repository using ssh on OSX"
+ date="2013-01-25T13:18:40Z"
+ content="""
+There is an issue with creating remote repositories using ssh (the problem may require using a different account name.) I filed the following bug:
+
+
+<http://git-annex.branchable.com/bugs/Error_creating_remote_repository_using_ssh_on_OSX/>
+
+Bug report:
+
+
+What steps will reproduce the problem?
+
+1. Click  \"Remote server: Set up a repository on a remote server using ssh.\" 
+2. Enter hostname and different username than currently logged in user
+3. Click check this server
+
+
+What is the expected output? 
+
+> I expected to see the next step in the remote repo creration process.
+
+What do you see instead?
+
+
+> Failed to ssh to the server. Transcript: ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory Permission denied, please try again. ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory Permission denied, please try again. ssh_askpass: exec(/usr/libexec/ssh-askpass): No such file or directory Permission denied (publickey,password). 
+
+
+What version of git-annex are you using? 
+
+> git-annex: Version: 3.20130114 
+
+
+On what operating system?
+
+> OSX: 10.8.2
+
+
+
+Please provide any additional information below.
+
+> I mentioned \"with a different username\" because the assistant will allow me to create a remote repository on the same target machine when I use my normal username. I think this is most likely because I have a ssh-key setup for the account on the remote machine. However I do not want to assume anything and send you down the wrong OSX rabbit hole. 
+
+> After a little research it seems that OSX does not have a ssh-askpass
+
+
+
+"""]]
diff --git a/doc/forum/What_is_the_difference_between___34__local_computer__34___and___34__remote_server__34__/comment_1_68734a118b7dc0c88ba67eca20953a55._comment b/doc/forum/What_is_the_difference_between___34__local_computer__34___and___34__remote_server__34__/comment_1_68734a118b7dc0c88ba67eca20953a55._comment
new file mode 100644
index 000000000..167d008f9
--- /dev/null
+++ b/doc/forum/What_is_the_difference_between___34__local_computer__34___and___34__remote_server__34__/comment_1_68734a118b7dc0c88ba67eca20953a55._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="2001:4978:f:21a::2"
+ subject="comment 1"
+ date="2013-01-25T22:39:20Z"
+ content="""
+Local computer pairs with another computer on your LAN. You don't need an account on that computer, it can belong to someone else and has to be running the webapp as well for them to verify the pairing. 
+
+Remote server is for people with a ssh server out there, and does not require it be running the assistant, or even have git-annex installed. (Though it works better if at least git-annex is installed on it.)
+"""]]
diff --git a/doc/forum/archaeology_of_deleted_files.mdwn b/doc/forum/archaeology_of_deleted_files.mdwn
new file mode 100644
index 000000000..a4ed66dc8
--- /dev/null
+++ b/doc/forum/archaeology_of_deleted_files.mdwn
@@ -0,0 +1,36 @@
+Earlier this week, I somehow lost a ton of files from my annex -- by switching on the command line from indirect to direct mode while the assistant was running, I think. I'm not sure.
+
+Anyway, by "lost" I mean "lost the symlinks to," because git-annex defaults to keeping content around till you tell it otherwise.  So I still had the content in the repos on my two backup drives.  All I needed was the symlinks back.
+
+But how to figure out exactly what I lost and get it back?
+
+I found that out here:
+
+http://stackoverflow.com/questions/953481/restore-a-deleted-file-in-a-git-repo
+
+Here's a magical formula you can use to find every single file deletion in the history of your repo:
+
+    git log --diff-filter=D --summary 
+
+That will give you every commit that deleted things, and what was deleted.
+
+To bring back all the files deleted in a given commit, where COMMITHASH is the commit hash, use this command:
+
+    git checkout COMMITHASH^1 -- .
+
+to bring back only a specific file:
+
+    git checkout COMMITHASH^1 -- path/to/file.txt
+
+to bring back only a subdirectory:
+
+    git checkout COMMITHASH^1 -- sub/directory
+
+that will bring them back into the staging area.  You can see which ones just reappeared by typing:
+
+    git status
+
+then you can actually make the restore permanent by typing: 
+
+    git commit -m "I just resurrected some files"
+
diff --git a/doc/forum/archaeology_of_deleted_files/comment_1_48f27df03ec18d2c27cf6b70dcf71dc5._comment b/doc/forum/archaeology_of_deleted_files/comment_1_48f27df03ec18d2c27cf6b70dcf71dc5._comment
new file mode 100644
index 000000000..3647193b8
--- /dev/null
+++ b/doc/forum/archaeology_of_deleted_files/comment_1_48f27df03ec18d2c27cf6b70dcf71dc5._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 1"
+ date="2013-01-25T14:07:36Z"
+ content="""
+seems I inadvertently got caught by Markdown -- I tried to write COMMITHASH-hat-1 and it turned into COMMITHASH superscript 1.
+
+Tilde (~) would also have worked instead of hat (^)
+"""]]
diff --git a/doc/forum/archaeology_of_deleted_files/comment_2_c698cd10c8038bac45bd1049506a27c3._comment b/doc/forum/archaeology_of_deleted_files/comment_2_c698cd10c8038bac45bd1049506a27c3._comment
new file mode 100644
index 000000000..363d32079
--- /dev/null
+++ b/doc/forum/archaeology_of_deleted_files/comment_2_c698cd10c8038bac45bd1049506a27c3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo"
+ nickname="Justin"
+ subject="comment 2"
+ date="2013-01-25T14:27:47Z"
+ content="""
+I fixed it for you
+"""]]
diff --git a/doc/forum/something_really_good_happened_with_3.20130124/comment_1_1712bddd2f483a353f6313aa626445f1._comment b/doc/forum/something_really_good_happened_with_3.20130124/comment_1_1712bddd2f483a353f6313aa626445f1._comment
new file mode 100644
index 000000000..e0a4907c6
--- /dev/null
+++ b/doc/forum/something_really_good_happened_with_3.20130124/comment_1_1712bddd2f483a353f6313aa626445f1._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="2001:4978:f:21a::2"
+ subject="comment 1"
+ date="2013-01-25T22:35:00Z"
+ content="""
+We fixed some broken javascript that only worked in all the browsers I tried, but not yours. It's always been this cool, just glad you can also experience it now!
+"""]]
diff --git a/doc/install/OSX/comment_12_a84028080578a8b60115b6c4ef823627._comment b/doc/install/OSX/comment_12_a84028080578a8b60115b6c4ef823627._comment
new file mode 100644
index 000000000..cc57cbdfb
--- /dev/null
+++ b/doc/install/OSX/comment_12_a84028080578a8b60115b6c4ef823627._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0"
+ nickname="Pere"
+ subject="git annex on Snow Leopard"
+ date="2013-01-25T14:36:52Z"
+ content="""
+Is there any way I can try to solve or by-pass the Segmentation Fault I commeted before? 
+"""]]