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

2 files changed, 17 insertions, 0 deletions

diff --git a/doc/bugs/Too_difficult_if_not_impossible_to_explicitly_add__47__keep_file_under_git___40__not_annex__41___in_v6_without_employing_.gitattributes/comment_5_9707d9dda7ebb2c94c71f1ea2f99064d._comment b/doc/bugs/Too_difficult_if_not_impossible_to_explicitly_add__47__keep_file_under_git___40__not_annex__41___in_v6_without_employing_.gitattributes/comment_5_9707d9dda7ebb2c94c71f1ea2f99064d._comment
new file mode 100644
index 000000000..cf1822b59
--- /dev/null
+++ b/doc/bugs/Too_difficult_if_not_impossible_to_explicitly_add__47__keep_file_under_git___40__not_annex__41___in_v6_without_employing_.gitattributes/comment_5_9707d9dda7ebb2c94c71f1ea2f99064d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="db48x"
+ avatar="http://cdn.libravatar.org/avatar/ad2688127feb555a92154b16d8eeb5d3"
+ subject="comment 5"
+ date="2017-02-14T21:10:13Z"
+ content="""
+I've got a repository that has a small file that gets updated regularly. I've given up trying to keep it unannexed and just started unlocking it every time I run the automated script that updates it.
+"""]]
diff --git a/doc/git-annex-enableremote/comment_3_4bc11d1df0ff6962b12f5b8a1bb6188e._comment b/doc/git-annex-enableremote/comment_3_4bc11d1df0ff6962b12f5b8a1bb6188e._comment
new file mode 100644
index 000000000..e3a926d83
--- /dev/null
+++ b/doc/git-annex-enableremote/comment_3_4bc11d1df0ff6962b12f5b8a1bb6188e._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e"
+ nickname="Sundar Raman"
+ avatar="http://cdn.libravatar.org/avatar/a5db56ac8777aee80bbe2b1e1d697c3961973049a22def38b4d15b7507e59c01"
+ subject="comment 3"
+ date="2017-02-14T20:21:41Z"
+ content="""
+Thanks much, did not think to use the 'describe' for that but that's very intuitive!
+"""]]