Merge branch 'jc/worktree-add-short-help' into maint