summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar http://joey.kitenet.net/ <joey@web>2011-02-02 00:47:43 +0000
committerGravatar admin <admin@branchable.com>2011-02-02 00:47:43 +0000
commit3ceef4410c49100b603bc41e2c8f9487ea093274 (patch)
treea7e90ac6200491ef45093aae7e08765721aa7f90
parent513da0f1ef4a1e05f4b4f9461b2eb1fad31fcb43 (diff)
-rw-r--r--doc/bugs/unannex_vs_unlock_hook_confusion._comment9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/bugs/unannex_vs_unlock_hook_confusion._comment b/doc/bugs/unannex_vs_unlock_hook_confusion._comment
new file mode 100644
index 000000000..8a6330377
--- /dev/null
+++ b/doc/bugs/unannex_vs_unlock_hook_confusion._comment
@@ -0,0 +1,9 @@
+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 an unlocked file? --[[Joey||