summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-05-14 12:30:19 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-05-14 12:30:19 -0400
commit89ee0c373b232c74dad31737b733b4110dbfcacc (patch)
treee86f3fa6801a66c6a463b5420ef2003aa7194f06
parentbbab57ebe70319b128e273bc8185c9381cdf7bf7 (diff)
parenta43a2731764e59e743fce4a75a5a416f24697754 (diff)
Merge remote-tracking branch 'branchable/master'
-rw-r--r--doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment b/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment
new file mode 100644
index 000000000..4a22d414b
--- /dev/null
+++ b/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 4"
+ date="2011-05-14T16:29:35Z"
+ content="""
+Although, if you really do want to shoot yourself in the foot, or know you have the old content, you can use `git-annex setkey`.
+"""]]