tree 652aa18fa64f72add5f9d7f89fa071e13fd6feed
parent 29aeb550eebfbac3dcd94a290cc4e5aa23071cad
parent 3ec4f1e2d1c9197a482c85b50222cd277aa2f1ac
author Junio C Hamano <gitster@pobox.com> 1794522951 -0800
committer Junio C Hamano <gitster@pobox.com> 1794522951 -0800

Merge branch 'jm/worktree-rebase-bisect-checked-out' into seen

The 'git worktree remove' command has been updated to refuse to remove
a worktree in the middle of a rebase or bisect operation unless
'--force' is given. The '%(worktreepath)' atom and 'git branch'
command now correctly identify the worktree that is rebasing or
bisecting a branch.

* jm/worktree-rebase-bisect-checked-out:
  branch: do not mark the branch the current worktree is rebasing
  ref-filter: add %(currentworktree)
  ref-filter: name the worktree of a branch being rebased or bisected
  doc: for-each-ref: say how to read %(worktreepath) safely
  worktree remove: refuse a worktree in the middle of an operation