diff options
| author |  https://id.koumbit.net/anarcat <https://id.koumbit.net/anarcat@web> | 2013-09-10 18:35:15 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-09-10 18:35:15 +0000 |
| commit | a792de3dc2c8a86f531a2cefc12de1e9b04296be (patch) | |
| tree | 61c539e73c3d57da127f01d4de3c0f5aaeae0485 | |
| parent | 0d6627ad49d8020dc3532e497b5b37716c471ccc (diff) | |
how to deal with renamed files between the two repos
| -rw-r--r-- | doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn index fd8eb6151..9fde576b3 100644 --- a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn +++ b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn @@ -60,3 +60,14 @@ Say that some files on `angela` are actually spread out outside of the `~/mp3` d cd ~/mp3 git annex import ~/music/ + +Deleting deleted files +---------------------- + +It is quite possible some files were removed (or renamed!) on `marcos` but not on `angela`, since it was synchronised only some time ago. A good way to find out about those files is to use the `--not --in` argument, for example, on `angela`: + + git annex whereis --in here --not --in marcos + +This will show files that are on `angela` and not on `marcos`. They could be new files that were only added on `angela`, so be careful! A manual analysis is necessary, but let's say you are certain those files are not relevant anymore, you can delete them from `angela`: + + git annex drop <file> |