diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-02-16 19:38:19 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-02-16 19:38:19 -0400 |
commit | baab4c2023c7bce2d4c5d7f8799e28ac59dd4583 (patch) | |
tree | fda26d0ca2a2707e19323ca7e260a2f9d1439830 | |
parent | 4b67ae596a133d285cc28593e26c47e5b14720c3 (diff) | |
parent | 74d8e9849e28f98c85e6265a58eb10884d0a9218 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/devblog/day_253__sqlite_for_incremental_fsck/comment_1_683d669ac6af8e314585609f75cfdaf3._comment b/doc/devblog/day_253__sqlite_for_incremental_fsck/comment_1_683d669ac6af8e314585609f75cfdaf3._comment new file mode 100644 index 000000000..17d1d11cf --- /dev/null +++ b/doc/devblog/day_253__sqlite_for_incremental_fsck/comment_1_683d669ac6af8e314585609f75cfdaf3._comment @@ -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]] +"""]] diff --git a/doc/forum/canceling_wrong_repository_merge/comment_2_87aabff41a1c6aec773b8f52ead51105._comment b/doc/forum/canceling_wrong_repository_merge/comment_2_87aabff41a1c6aec773b8f52ead51105._comment new file mode 100644 index 000000000..83d5c4834 --- /dev/null +++ b/doc/forum/canceling_wrong_repository_merge/comment_2_87aabff41a1c6aec773b8f52ead51105._comment @@ -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. +"""]] |