summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-22 17:56:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-22 17:56:07 -0400
commitc7a1690f0247fefedc9b735bee1273660fc94e77 (patch)
tree18fa400b6e044d9a38049935a51b7215a3304178
parent1a182d4d047c24e217663dbccfa39aae907cbbc0 (diff)
update
-rw-r--r--doc/bugs/bare_git_repos.mdwn2
-rw-r--r--doc/todo/branching.mdwn2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/bugs/bare_git_repos.mdwn b/doc/bugs/bare_git_repos.mdwn
index f219840e7..5e9100acf 100644
--- a/doc/bugs/bare_git_repos.mdwn
+++ b/doc/bugs/bare_git_repos.mdwn
@@ -11,7 +11,7 @@ However, that is not currently supported. Problems include:
a git repo at all!)
* `.git-annex/` needs to have state recorded to it and committed, and that
is not possible with a bare repo. (If [[todo/branching]] were done,
- that might be fixed.)
+ that might be fixed.) (now fixed)
----
diff --git a/doc/todo/branching.mdwn b/doc/todo/branching.mdwn
index 37e7b6edd..ad7ece6f1 100644
--- a/doc/todo/branching.mdwn
+++ b/doc/todo/branching.mdwn
@@ -1,3 +1,5 @@
+[[done]] !!!
+
The use of `.git-annex` to store logs means that if a repo has branches
and the user switched between them, git-annex will see different logs in
the different branches, and so may miss info about what remotes have which