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

corrupt branch resetting (but not yet reflog walking)

Browse source
This commit is contained in:
Joey Hess 2013-10-21 16:19:00 -04:00
parent fcd91be6f0
commit 18487c779f
3 changed files with 58 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/design/assistant/disaster_recovery.mdwn
View file

@ -143,8 +143,7 @@ that was found for it.
`git annex fsck --fast` to fix up any object location info.
* Remote tracking branches can just be removed, and then `git fetch`
from the remote, which will re-download missing objects from it and
reinstate the tracking branch.
* For other branches (or tags), it's best to not rewrite them, because
that could get really confusing. Instead, delete the old broken branch,
and make a "recovered/$branch" that holds the last good commit (if one
was found).
reinstate the tracking branch. **done**
* For other branches, reset them to last good commit, or delete
if none was found.
* (Decided not to touch tags.)