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 2012-05-31 15:30:30 -04:00
commit 8a0a07ab10
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/tips/what_to_do_when_you_lose_a_repository/comment_1_cf19b8dc304dc37c26717174c4a98aa4._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://dlaxalde.myopenid.com/"
nickname="dl"
subject="comment 1"
date="2012-05-31T14:36:33Z"
content="""
Is there a way to have git-annex completely ignore a repository? I see that
the `dead` command adds the uuid of the repository to `trust.log` but does
not change `uuid.log`. Is it enough to remove the corresponding line in
`uuid.log` and `trust.log`?
"""]]

8
doc/tips/what_to_do_when_you_lose_a_repository/comment_3_fa9ca81668f5faebf2f61b10f82c97d2._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.8.243"
subject="comment 3"
date="2012-05-31T17:01:37Z"
content="""
`dead` is the best we can do. The automatic merging used on the git-annex branch tends to re-add lines that are deleted in one repo when merging with another that still has them.
"""]]