diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 16:16:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 16:16:32 -0400 |
| commit | 516ffc19bbb2a6123d21092edaa4af79545c53f7 (patch) | |
| tree | f8d687776c403f27d2dbd6a9b5ce34564c8e087a | |
| parent | a5fe7e571fdc65e96a309323d8950565f3cacb81 (diff) | |
update
| -rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files.mdwn | 3 | ||||
| -rw-r--r-- | doc/news/version_5.20140709.mdwn | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files.mdwn b/doc/bugs/bad_merge_commit_deleting_all_files.mdwn index 4e9e39cb4..affabdb02 100644 --- a/doc/bugs/bad_merge_commit_deleting_all_files.mdwn +++ b/doc/bugs/bad_merge_commit_deleting_all_files.mdwn @@ -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 diff --git a/doc/news/version_5.20140709.mdwn b/doc/news/version_5.20140709.mdwn index 963d7131c..e7609949f 100644 --- a/doc/news/version_5.20140709.mdwn +++ b/doc/news/version_5.20140709.mdwn @@ -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."""]]
\ No newline at end of file + empty merge commits."""]] |