summaryrefslogtreecommitdiff
path: root/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-12 20:35:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-12 20:35:20 -0400
commitfe612bac0361b42af2cdff590797e929cebbb53d (patch)
treeb8398a7b42d258b7918a481d25449e1ea592e2d8 /git-annex.mdwn
parentd029c48d0ae5485329b4e8757b45f320bb8bfea9 (diff)
thought
Diffstat (limited to 'git-annex.mdwn')
-rw-r--r--git-annex.mdwn8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-annex.mdwn b/git-annex.mdwn
index 84030bfca..3a8db6dcf 100644
--- a/git-annex.mdwn
+++ b/git-annex.mdwn
@@ -180,3 +180,11 @@ remote, to check local disk space.
When git-rm removed a file, it should get dropped too. Of course, it may
not be dropped right away, depending on number of copies available.
+
+### branching
+
+The use of `.git-annex` to store state means that if a repo has branches
+and the user switched between them, git-annex will see different state in
+the different branches. Whether that is a bug or a feature may depend on
+point of view -- call it Too Be Determined. An alternative would be to
+store data directly in the git repo as `pristine-tar` does.