From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Dec 2024 07:30:12 +0000 (+0900)
Subject: Merge branch 'cw/worktree-extension' into ps/ci-meson
X-Git-Tag: v2.48.0-rc1~9^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb656b4222eb3df665701ad4f2172af627f9daf1;p=thirdparty%2Fgit.git

Merge branch 'cw/worktree-extension' into ps/ci-meson

* cw/worktree-extension:
  worktree: refactor `repair_worktree_after_gitdir_move()`
  worktree: add relative cli/config options to `repair` command
  worktree: add relative cli/config options to `move` command
  worktree: add relative cli/config options to `add` command
  worktree: add `write_worktree_linking_files()` function
  worktree: refactor infer_backlink return
  worktree: add `relativeWorktrees` extension
  setup: correctly reinitialize repository version
---

cb656b4222eb3df665701ad4f2172af627f9daf1