summaryrefslogtreecommitdiff
path: root/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-02-01 21:01:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-02-01 21:01:43 -0400
commited089c22554ca5b3cd8c8f532db4a9fcc65385d1 (patch)
tree808a48734462623a50c880ac67bb1cee3aa55aba /doc/bugs/unannex_vs_unlock_hook_confusion.mdwn
parent1f136cb764a522253cae39bc42eff06e5d9c2178 (diff)
rename (caused by ikiwiki bug, now fixed)
Diffstat (limited to 'doc/bugs/unannex_vs_unlock_hook_confusion.mdwn')
-rw-r--r--doc/bugs/unannex_vs_unlock_hook_confusion.mdwn9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn b/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn
new file mode 100644
index 000000000..8a6330377
--- /dev/null
+++ b/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn
@@ -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||