summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-08 16:19:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-08 16:19:30 -0400
commit3e24721664c92e84464c9a9033956c075409843c (patch)
tree3eb1abcfa27e7e22df56ee7d3ad5c2ead0923770
parent60b698bcc4ddf4f74ae946e31d2415bab4fc81bd (diff)
parentcaba4a986fb253cff2eea636ca16d6cba4cdcb6b (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/forum/Coming_from_git_world/comment_2_ed1847dd3f47a9d013b8dd0455fb80ff._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/forum/Coming_from_git_world/comment_2_ed1847dd3f47a9d013b8dd0455fb80ff._comment b/doc/forum/Coming_from_git_world/comment_2_ed1847dd3f47a9d013b8dd0455fb80ff._comment
new file mode 100644
index 000000000..33d7d44d3
--- /dev/null
+++ b/doc/forum/Coming_from_git_world/comment_2_ed1847dd3f47a9d013b8dd0455fb80ff._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.7.235"
+ subject="comment 2"
+ date="2013-07-08T20:18:27Z"
+ content="""
+And yes, you can use the same git repository for files added to git `git add file` and added to git annex `git annex add file`
+"""]]