mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

notes

Browse source
This commit is contained in:
Joey Hess 2011-04-09 11:13:01 -04:00
parent c5174f0cb8
commit fdf1c64812
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/todo/branching.mdwn
View file

@ -115,3 +115,14 @@ would solve the merge problem, since git auto merge could be used. It would
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]]
## notes
Another approach could be to use git-notes. It supports merging branches
of notes, with union merge strategy (a hook would have to do this after
a pull, it's not done automatically).
Problem: Notes are usually attached to git
objects, and there are no git objects corresponding to git-annex keys.
Problem: Notes are not normally copied when cloning.