diff options
Diffstat (limited to 'doc/bugs/unannex_vs_unlock_hook_confusion.mdwn')
-rw-r--r-- | doc/bugs/unannex_vs_unlock_hook_confusion.mdwn | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn b/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn deleted file mode 100644 index c03990c20..000000000 --- a/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn +++ /dev/null @@ -1,15 +0,0 @@ -See [[forum/unannex_alternatives]] for problem description. - -If an unannex is followed by a "git add; git commit", git-annex's hook thinks -that you have used git annex unlock on the file and are -now committing a changed version, and the right thing to do there is to add the -new content to the annex and update the symlink accordingly. - -Can we tell the difference between an unannexed file that has yet to be committed -and has been re-added as a normal file, vs an unlocked file? --[[Joey|| - -> Hmm, not really. An unannexed file's content will have been dropped from -> the backend, but that's about the only difference. Perhaps unannex should -> just commit the removal of the file itself? --[[Joey]] - -> [[done]], staged changes committed at end. |