diff options
author | https://id.koumbit.net/anarcat <https://id.koumbit.net/anarcat@web> | 2015-02-16 23:22:19 +0000 |
---|---|---|
committer | admin <admin@branchable.com> | 2015-02-16 23:22:19 +0000 |
commit | 74d8e9849e28f98c85e6265a58eb10884d0a9218 (patch) | |
tree | 5f970e9869481cf9c9f4d41844cdffc47bb57bdc | |
parent | 9164883dd063ebbb36c0cfab89449b5b7049f0c9 (diff) |
Added a comment: watch out for direct mode
-rw-r--r-- | doc/forum/canceling_wrong_repository_merge/comment_2_87aabff41a1c6aec773b8f52ead51105._comment | 11 |
1 files changed, 11 insertions, 0 deletions
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. +"""]] |