diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:59 -0700 |
| commit | 1c515bf7e2b395509a122fb92cd6f925bf09a6fe (patch) | |
| tree | 8e4410c4163d6d8c985f7aef742efab8cb563ef6 /Documentation/user-manual.txt | |
| parent | Merge branch 'sg/doc-trace-appends' (diff) | |
| parent | doc-diff: force worktree add (diff) | |
| download | tgif-1c515bf7e2b395509a122fb92cd6f925bf09a6fe.tar.xz | |
Merge branch 'es/worktree-forced-ops-fix'
Fix a bug in which the same path could be registered under multiple
worktree entries if the path was missing (for instance, was removed
manually). Also, as a convenience, expand the number of cases in
which --force is applicable.
* es/worktree-forced-ops-fix:
doc-diff: force worktree add
worktree: delete .git/worktrees if empty after 'remove'
worktree: teach 'remove' to override lock when --force given twice
worktree: teach 'move' to override lock when --force given twice
worktree: teach 'add' to respect --force for registered but missing path
worktree: disallow adding same path multiple times
worktree: prepare for more checks of whether path can become worktree
worktree: generalize delete_git_dir() to reduce code duplication
worktree: move delete_git_dir() earlier in file for upcoming new callers
worktree: don't die() in library function find_worktree()
Diffstat (limited to 'Documentation/user-manual.txt')
0 files changed, 0 insertions, 0 deletions