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

4 files changed, 40 insertions, 0 deletions

diff --git a/doc/Android/comment_7_725ec376b56f51afa37dfd750c744f73._comment b/doc/Android/comment_7_725ec376b56f51afa37dfd750c744f73._comment
new file mode 100644
index 000000000..ea8f83250
--- /dev/null
+++ b/doc/Android/comment_7_725ec376b56f51afa37dfd750c744f73._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joseph.rawson.works@85a210ab8c0e37a0b2d6bb235738b20e23e8878f"
+ nickname="joseph.rawson.works"
+ subject="ssh keys, github, xmpp"
+ date="2015-12-28T22:09:24Z"
+ content="""
+I generated an rsa keypair and added them to /sd/ga-h/.ssh, yet they were overwritten.  I couldn't access my annexes located on github.  I couldn't login to google talk, as instructed by the web app.
+
+Thanks for letting me know about gitlab supporting git-annex.
+"""]]
diff --git a/doc/forum/Integrating_annex_get_into_git_checkout_with_hooks.mdwn b/doc/forum/Integrating_annex_get_into_git_checkout_with_hooks.mdwn
new file mode 100644
index 000000000..5482f78da
--- /dev/null
+++ b/doc/forum/Integrating_annex_get_into_git_checkout_with_hooks.mdwn
@@ -0,0 +1,7 @@
+I am considering using git annex for an existing work project that is getting bloated with compressed tarballs. We have a team of 7, so making the annex invisible to day to day use is important.
+
+Are there any git hooks that will make the process of git checkout/merge etc automatically do a git annex get ..., our do I have to write these myself?
+
+
+
+
diff --git a/doc/git-annex-importfeed/comment_1_d0197108d07873040e46577df1faadbd._comment b/doc/git-annex-importfeed/comment_1_d0197108d07873040e46577df1faadbd._comment
new file mode 100644
index 000000000..0d97406d9
--- /dev/null
+++ b/doc/git-annex-importfeed/comment_1_d0197108d07873040e46577df1faadbd._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="joseph.rawson.works@85a210ab8c0e37a0b2d6bb235738b20e23e8878f"
+ nickname="joseph.rawson.works"
+ subject="Replacing dashes with underscores"
+ date="2015-12-28T22:39:49Z"
+ content="""
+An example rss item entry:
+
+    <item><title>00135929509939-04</title><guid isPermaLink=\"false\">http://40.media.tumblr.com/01a46c39dc0e0f3447fbed4f0807047f/tumblr_nyoj75VlaG1sgxjc6o3_1280.jpg</guid><enclosure url=\"http://40.media.tumblr.com/01a46c39dc0e0f3447fbed4f0807047f/tumblr_nyoj75VlaG1sgxjc6o3_1280.jpg\" length=\"0\" type=\"\"/></item>
+
+Using --template '${itemtitle}${extension}'
+
+The resulting filename is **00135929509939_04.jpg** (The dash was replaced with an underscore).
+
+I decided to just change all the filenames in each blog repository to use underscores, however, I thought you might want to know about this.
+"""]]
diff --git a/doc/todo/ditch_yesod/comment_1_976dcb99ebe30c02c9b223f19a67c875._comment b/doc/todo/ditch_yesod/comment_1_976dcb99ebe30c02c9b223f19a67c875._comment
new file mode 100644
index 000000000..d09065e01
--- /dev/null
+++ b/doc/todo/ditch_yesod/comment_1_976dcb99ebe30c02c9b223f19a67c875._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="umeboshi"
+ subject="Link to TH"
+ date="2015-12-29T20:36:41Z"
+ content="""
+I had to google for [TH](https://wiki.haskell.org/Template_Haskell).  I'm posting this link for those who, like me, are less familiar with Haskell.
+"""]]