diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-21 16:19:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-21 16:20:54 -0400 |
| commit | afe0cc0bb4fbe3876c35462dece4670617263877 (patch) | |
| tree | f23797ee89c453d7c82f35e47bb5fc197662a5f4 /doc | |
| parent | 727566ad23efc6c36a4a4473b3299af913f6ce03 (diff) | |
corrupt branch resetting (but not yet reflog walking)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/design/assistant/disaster_recovery.mdwn | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/design/assistant/disaster_recovery.mdwn b/doc/design/assistant/disaster_recovery.mdwn index 1a2b55477..770c8f43a 100644 --- a/doc/design/assistant/disaster_recovery.mdwn +++ b/doc/design/assistant/disaster_recovery.mdwn @@ -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.) |