summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar http://christian.amsuess.com/chrysn <chrysn@web>2011-02-01 23:39:12 +0000
committerGravatar admin <admin@branchable.com>2011-02-01 23:39:12 +0000
commit3c13f62f11d1aca82ea48cfa9cf66c4bd88a7b7b (patch)
tree82f9363c81d843ded34c45b4576faf7123f3f4c0
parent27056daccd1a2f541cd104a835a32523a532d4da (diff)
getting git-annex files back to git
-rw-r--r--doc/forum/unannex_alternatives.mdwn9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/forum/unannex_alternatives.mdwn b/doc/forum/unannex_alternatives.mdwn
new file mode 100644
index 000000000..efd05838e
--- /dev/null
+++ b/doc/forum/unannex_alternatives.mdwn
@@ -0,0 +1,9 @@
+what is the work flow to get a file that is in git-annex out of there and into git? (current situation: `git-annex add`ed a bunch of pictures, later found make files in there which i'd rather have in git for proper source code control)
+
+the most intuitive thing to do is `git unannex`, which at first seemed to do the right thing, but when committing there came the hook and everything was back to where it was before.
+
+i could disable the hook as a workaround, but that doesn't smell like a good work flow.
+
+the [[man page|git-annex]] does warn that `unannex` is only supposed to be used against unintentional `git annex add`s (probably meaning that it should be used before something is committed), but the alternatives it suggests (`git rm` and `git annex drop`) don't to what i want to do.
+
+am i missing something or is there really no work flow for this? --[[chrysn]]