mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2014-09-17 13:06:17 -04:00
commit 692928128a
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_2_cb6971a766a28bd8c094d0b986272c65._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE"
nickname="Torkaly"
subject="comment 2"
date="2014-09-17T08:47:03Z"
content="""
Thank you for the answer.
There are no origin/synced/* branches, only a origin/git-annex and the local git-annex branch. What i need git annex merge to do, is to merge the fetched remote git-annex with the local git-annex. There is no need for creating or merging the synced-branches as there are no.
"""]]

10
doc/forum/usability:_creating_an_archive_on_a_new_external_drive/comment_2_b3a6b5ff0aaddd78903fc7bc7fbd6ee2._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
ip="70.83.139.100"
subject="comment 2"
date="2014-09-16T20:35:23Z"
content="""
i wouldn't expect those changes to be committed. it's an external drive, and unless i manually sync it, it should take into account my changes.
i am more surprised by the bare repository than i would be surprised by my changes not propagating back, i think. --[[anarcat]]
"""]]