summaryrefslogtreecommitdiff
path: root/doc/todo/optimise_git-annex_merge.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-28 13:46:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-28 13:46:26 -0400
commitc9031fc4831e1d22b120a73447486e3dad777b69 (patch)
tree517c6f7d049ba6ee2539031d1de8cb1a81594220 /doc/todo/optimise_git-annex_merge.mdwn
parentecfe9e278692a24ad9a8fb71d3e013ca01903641 (diff)
add: Fix reversion in 4.20130827 when adding unlocked files that have not yet been committed.
catKeyFileHEAD is still checked too, because when doing a git commit with unlocked files, the file gets staged to the index, so is not typechanged there. (This is also why git annex add foo; git annex unlock foo; git commit -a does not re-annex foo, because there is no indication left that it was added.)
Diffstat (limited to 'doc/todo/optimise_git-annex_merge.mdwn')
0 files changed, 0 insertions, 0 deletions