summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-20 13:48:02 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-20 21:37:18 -0400
commit2fcb8e3b11cdbb9de253050c1fbb6f08ef1071e2 (patch)
treeb2cfeec02e5d39fa116e2af270e007a72bea9cea
parente593a81041f3c55e8b2803d4cc07adc9b206b46f (diff)
update
-rw-r--r--doc/todo/branching.mdwn7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/todo/branching.mdwn b/doc/todo/branching.mdwn
index a035e53e8..3a7a2d3ca 100644
--- a/doc/todo/branching.mdwn
+++ b/doc/todo/branching.mdwn
@@ -118,6 +118,13 @@ still mean all the log files are on-disk, which annoys some. It would
require some tighter integration with git, so that after a pull, the log
repo is updated with the data pulled. --[[Joey]]
+> Seems I can't use git fake bare exactly. Instead, the best option
+> seems to be `git clone --shared` to make a clone that uses
+> `.git/annex/logs/.git` to hold its index etc, but (mostly) uses
+> objects from the main repo. There would be some bloat,
+> as commits to the logs made in there would not be shared with the main
+> repo. Using `GIT_OBJECT_DIRECTORY` might be a way to avoid that bloat.
+
## notes
Another approach could be to use git-notes. It supports merging branches