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

update

Browse source
This commit is contained in:
Joey Hess 2014-07-09 16:16:32 -04:00
parent 0f382a0256
commit f15d2aa35d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/bugs/bad_merge_commit_deleting_all_files.mdwn
View file

@ -42,6 +42,9 @@ Note that it's possible that some repositories may have pruned the deleted
files as unused. This is most likely to happen in the repository that made
the bad merge commit in the first place.
If you have any problems following these instructions, please contact
<urgent2014@joeyh.name> for support.
[[!tag confirmed urgent]]
## analysis

2
doc/news/version_5.20140709.mdwn
View file

@ -8,4 +8,4 @@ git-annex 5.20140709 released with [[!toggle text="these changes"]]
* Fix bug in automatic merge conflict resolution, when one side is an
annexed symlink, and the other side is a non-annexed symlink.
* Really fix bug that caused the assistant to make many unncessary
empty merge commits."""]]
empty merge commits."""]]