diff options
author | Joey Hess <joey@kitenet.net> | 2012-12-08 17:47:41 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-12-08 17:47:41 -0400 |
commit | 698e18c934ae8a403f1eaf8cce74104db72a207d (patch) | |
tree | 9f9d2091b995b4cb9fde1e59f8b4a036ed580300 /doc | |
parent | bf990f23225c7f2eb114327c5ae6c4becd228175 (diff) | |
parent | 1a81431314acacae6ce6ec0a3852c3647f4be5a1 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
-rw-r--r-- | doc/forum/External_drive_syncs_git-annex_branch_but_not_master_branch/comment_1_9a909e3d89061adacbd8ed370520250c._comment | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/forum/External_drive_syncs_git-annex_branch_but_not_master_branch/comment_1_9a909e3d89061adacbd8ed370520250c._comment b/doc/forum/External_drive_syncs_git-annex_branch_but_not_master_branch/comment_1_9a909e3d89061adacbd8ed370520250c._comment new file mode 100644 index 000000000..43fe578e1 --- /dev/null +++ b/doc/forum/External_drive_syncs_git-annex_branch_but_not_master_branch/comment_1_9a909e3d89061adacbd8ed370520250c._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://edheil.wordpress.com/" + ip="173.162.44.162" + subject="comment 1" + date="2012-12-08T21:25:49Z" + content=""" +apologies if I misunderstand your question, but I believe that git-annex puts the metadata in the repository's sync/master branch, which you can merge into the repository's local master either manually or by running \"git annex sync\" in the repository. + +"""]] |