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

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

Browse source
This commit is contained in:
Joey Hess 2015-02-16 19:38:19 -04:00
commit 8346ce18a8
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/devblog/day_253__sqlite_for_incremental_fsck/comment_1_683d669ac6af8e314585609f75cfdaf3._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
subject="comment 1"
date="2015-02-16T21:26:22Z"
content="""
i am curious: why separate database files while you can have multiple tables in the same database file? --[[anarcat]]
"""]]

11
doc/forum/canceling_wrong_repository_merge/comment_2_87aabff41a1c6aec773b8f52ead51105._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
subject="watch out for direct mode"
date="2015-02-16T23:22:19Z"
content="""
so while `git rebase` can do magic, it will not work out of the box on direct mode repositories, unless you use `-c core.bare=false`, in which case you will totally shoot yourself in the foot because git will happily remove all those real files sitting in the checkout. you will need to `git annex indirect` before you do any of that magic. working on a clone of the git repo is also a good idea, if only for testing.
i personnally destroyed my whole music collection doing such a cleanup of the history. fortunately, i had a recent archived clone of the repo, so things weren't so bad.
but watch out for direct mode, as always.
"""]]