diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2020-08-27 04:21:25 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-27 08:59:13 -0700 |
| commit | e8e1ff24c5cf885c8d0ac208b58ccaf3760e8bfa (patch) | |
| tree | 4d72a0cae04162794a490e45a8c9fa7dcbcfc91b /Documentation/git-worktree.txt | |
| parent | e9b77c84a0a0df029f2a3a8114e9f22186e7da24 (diff) | |
| download | git-e8e1ff24c5cf885c8d0ac208b58ccaf3760e8bfa.tar.gz | |
worktree: add skeleton "repair" command
Worktree administrative files can become corrupted or outdated due to
external factors. Although, it is often possible to recover from such
situations by hand-tweaking these files, doing so requires intimate
knowledge of worktree internals. While information necessary to make
such repairs manually can be obtained from git-worktree.txt and
gitrepository-layout.txt, we can assist users more directly by teaching
git-worktree how to repair its administrative files itself (at least to
some extent). Therefore, add a "git worktree repair" command which
attempts to correct common problems which may arise due to factors
beyond Git's control.
At this stage, the "repair" command is a mere skeleton; subsequent
commits will flesh out the functionality.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-worktree.txt')
| -rw-r--r-- | Documentation/git-worktree.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 6ee6ec7982..ae432d39a8 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -15,6 +15,7 @@ SYNOPSIS 'git worktree move' <worktree> <new-path> 'git worktree prune' [-n] [-v] [--expire <expire>] 'git worktree remove' [-f] <worktree> +'git worktree repair' 'git worktree unlock' <worktree> DESCRIPTION @@ -110,6 +111,11 @@ and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed. +repair:: + +Repair working tree administrative files, if possible, if they have +become corrupted or outdated due to external factors. + unlock:: Unlock a working tree, allowing it to be pruned, moved or deleted. |