Merge pull request #540 from umekikazuya/document-clone-config

docs: mention clone.defaultRemoteName
2026-09-10 15:36:19 -04:00 · 2026-08-22 13:58:52 +09:00 · 2026-08-16 03:00:38 +09:00 · 2026-07-11 02:45:52 +09:00 · 2026-07-11 02:45:31 +09:00 · 2026-07-11 02:45:13 +09:00
37 changed files with 1638 additions and 391 deletions
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@ -0,0 +1,20 @@
+# Copilot Instructions for ghq
+
+## Language & Build
+
+- This is a Go project. Use `go build` to build and `go test ./...` to run tests.
+
+## Code Quality Checks
+
+Before committing, always run the following in order:
+
+1. `goimports -w .` — format code and organize imports
+2. `go vet ./...` — check for common errors
+3. `staticcheck ./...` — run static analysis
+
+All three must pass with no errors before pushing.
+
+## Testing
+
+- Run `go test ./...` to execute all tests.
+- Ensure all existing tests pass after making changes.
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -4,7 +4,15 @@ updates:
    directory: "/"
    schedule:
      interval: "weekly"
+    groups:
+      golang-x:
+        patterns:
+          - "golang.org/x/*"
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
      interval: "weekly"
+    groups:
+      actions:
+        patterns:
+          - "actions/*"
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@ -7,15 +7,15 @@ permissions:
  contents: read
 jobs:
  test:
-    timeout-minutes: 10
+    timeout-minutes: 20
    runs-on: macos-latest
    steps:
    - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      with:
        persist-credentials: false
    - name: setup go
-      uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+      uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
      with:
        go-version-file: go.mod
    - name: install
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      with:
        persist-credentials: false
    - uses: ./.github/actions/release
--- a/.github/workflows/reviewdog.yaml
+++ b/.github/workflows/reviewdog.yaml
@ -13,10 +13,10 @@ jobs:
    name: Spell Check with Typos
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      with:
        persist-credentials: false
-    - uses: crate-ci/typos@9066e9940a8a05b98fb4733c62a726f83c9e57f8 # v1.43.3
+    - uses: crate-ci/typos@bee27e3a4fd1ea2111cf90ab89cd076c870fce14 # v1.48.0

  staticcheck:
    permissions:
@ -27,11 +27,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code into the Go module directory
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
      - name: staticcheck
-        uses: reviewdog/action-staticcheck@50f9bfcf3738839ddc95deac241b904d77469096 # v1.28.0
+        uses: reviewdog/action-staticcheck@564f18c6297af36f7b10b6c7a72e814341bd813a # v1.29.0
        with:
          reporter: github-pr-review
          level: warning
@ -45,7 +45,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code into the Go module directory
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
      - name: misspell
@ -62,9 +62,9 @@ jobs:
    timeout-minutes: 10
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
-      - uses: reviewdog/action-actionlint@e58ee9d111489c31395fbe4857b0be6e7635dbda # v1.70.0
+      - uses: reviewdog/action-actionlint@6fb7acc99f4a1008869fa8a0f09cfca740837d9d # v1.72.0
        with:
          reporter: github-pr-review
--- a/.github/workflows/tagpr.yaml
+++ b/.github/workflows/tagpr.yaml
@ -14,16 +14,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      with:
        persist-credentials: false
    - name: setup go
-      uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+      uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
      with:
        go-version-file: go.mod
    - name: tagpr
      id: tagpr
-      uses: Songmu/tagpr@78a926ba835e34721053309043aee696ba9c70b1 # v1.15.0
+      uses: Songmu/tagpr@e84001bd5dac8defa0c75b3913937d284a3b3660 # v1.20.0
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    - uses: ./.github/actions/release
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@ -1,8 +1,11 @@
 name: test
 on:
-  push:
+  pull_request:
    branches:
    - "**"
+  push:
+    branches:
+    - master
 permissions:
  contents: read
  pull-requests: read
@ -24,14 +27,14 @@ jobs:
        git config --global core.eol lf
      if: "matrix.os == 'windows-latest'"
    - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      with:
        persist-credentials: false
    - name: setup go
-      uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+      uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
      with:
        go-version-file: go.mod
    - name: test
      run: go test -coverprofile coverage.out -covermode atomic ./...
    - name: Send coverage
-      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+      uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,4 @@
 /dist
 .vscode
 .idea
+coverage.out
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,43 @@
 # Changelog

+## [v1.10.1](https://github.com/x-motemen/ghq/compare/v1.10.0...v1.10.1) - 2026-04-11
+- feat(rm): make ghq rm worktree-aware by @chris-monardo in https://github.com/x-motemen/ghq/pull/481
+
+## [v1.10.0](https://github.com/x-motemen/ghq/compare/v1.9.4...v1.10.0) - 2026-04-09
+- Update zsh completion to match current commands and flags by @upft-kengotate in https://github.com/x-motemen/ghq/pull/465
+- chore(deps): bump Songmu/tagpr from 1.17.0 to 1.17.1 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/461
+- chore(deps): bump golang.org/x/text from 0.34.0 to 0.35.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/468
+- chore(deps): bump actions/setup-go from 6.2.0 to 6.3.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/463
+- chore(deps): bump crate-ci/typos from 1.43.4 to 1.44.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/462
+- chore(deps): bump reviewdog/action-actionlint from 1.70.0 to 1.71.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/458
+- chore(deps): bump golang.org/x/net from 0.50.0 to 0.52.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/467
+- feat(completion): add ghq list completion to ghq rm in fish/zsh by @nurazon59 in https://github.com/x-motemen/ghq/pull/469
+- chore(deps): bump Songmu/tagpr from 1.17.1 to 1.18.1 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/478
+- feat(get): add `ghq.defaultHost` config to resolve the default host. by @sciencesakura in https://github.com/x-motemen/ghq/pull/472
+- Update urfave/cli/v2 to v3 by @hezhizhen in https://github.com/x-motemen/ghq/pull/473
+- chore(deps): bump actions/setup-go from 6.3.0 to 6.4.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/475
+- chore(deps): bump reviewdog/action-actionlint from 1.71.0 to 1.72.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/477
+- chore(deps): bump codecov/codecov-action from 5.5.2 to 6.0.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/476
+- chore(deps): bump crate-ci/typos from 1.44.0 to 1.45.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/479
+- feat(get): output local repository path to stdout by @KeitaShimura in https://github.com/x-motemen/ghq/pull/457
+
+## [v1.9.4](https://github.com/x-motemen/ghq/compare/v1.9.3...v1.9.4) - 2026-02-17
+- apply go fix modernizations by @yulog in https://github.com/x-motemen/ghq/pull/450
+- feat(migrate): make worktree and submodule aware by @atusy in https://github.com/x-motemen/ghq/pull/449
+- chore(deps): bump crate-ci/typos from 1.43.3 to 1.43.4 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/451
+- chore(deps): bump Songmu/tagpr from 1.15.0 to 1.17.0 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/452
+- Fix Windows worktree migration failure: normalize Git path separators by @Copilot in https://github.com/x-motemen/ghq/pull/454
+
+## [v1.9.3](https://github.com/x-motemen/ghq/compare/v1.9.2...v1.9.3) - 2026-02-14
+- migrate: Handle cross-device move (EXDEV fallback) by @Copilot in https://github.com/x-motemen/ghq/pull/446
+
+## [v1.9.2](https://github.com/x-motemen/ghq/compare/v1.9.1...v1.9.2) - 2026-02-13
+- Go 1.26 by @Songmu in https://github.com/x-motemen/ghq/pull/443
+
+## [v1.9.1](https://github.com/x-motemen/ghq/compare/v1.9.0...v1.9.1) - 2026-02-13
+- Go 1.26 by @Songmu in https://github.com/x-motemen/ghq/pull/439
+- migrate: Add multi-VCS remote URL support by @Copilot in https://github.com/x-motemen/ghq/pull/442
+
 ## [v1.9.0](https://github.com/x-motemen/ghq/compare/v1.8.1...v1.9.0) - 2026-02-13
 - chore(deps): bump github.com/Songmu/gitconfig from 0.2.1 to 0.2.2 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/434
 - chore(deps): bump crate-ci/typos from 1.42.3 to 1.43.3 by @dependabot[bot] in https://github.com/x-motemen/ghq/pull/436
--- a/135
+++ b/135
@ -117,33 +117,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 ================================================================

-github.com/cpuguy83/go-md2man/v2
-https://github.com/cpuguy83/go-md2man/v2
----------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) 2014 Brian Goff
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-================================================================
-
 github.com/davecgh/go-spew
 https://github.com/davecgh/go-spew
 ----------------------------------------------------------------
@ -379,6 +352,46 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ================================================================

+github.com/otiai10/copy
+https://github.com/otiai10/copy
+----------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) 2018 otiai10
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+================================================================
+
+github.com/otiai10/mint
+https://github.com/otiai10/mint
+----------------------------------------------------------------
+Copyright 2017 otiai10 (Hiromu OCHIAI)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+================================================================
+
 github.com/pmezard/go-difflib
 https://github.com/pmezard/go-difflib
 ----------------------------------------------------------------
@ -412,41 +425,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 ================================================================

-github.com/russross/blackfriday/v2
-https://github.com/russross/blackfriday/v2
----------------------------------------------------------------
-Blackfriday is distributed under the Simplified BSD License:
-
-> Copyright © 2011 Russ Ross
-> All rights reserved.
->
-> Redistribution and use in source and binary forms, with or without
-> modification, are permitted provided that the following conditions
-> are met:
->
-> 1.  Redistributions of source code must retain the above copyright
->     notice, this list of conditions and the following disclaimer.
->
-> 2.  Redistributions in binary form must reproduce the above
->     copyright notice, this list of conditions and the following
->     disclaimer in the documentation and/or other materials provided with
->     the distribution.
->
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-> POSSIBILITY OF SUCH DAMAGE.
-
-================================================================
-
 github.com/saracen/walker
 https://github.com/saracen/walker
 ----------------------------------------------------------------
@ -500,12 +478,12 @@ SOFTWARE.

 ================================================================

-github.com/urfave/cli/v2
-https://github.com/urfave/cli/v2
+github.com/urfave/cli/v3
+https://github.com/urfave/cli/v3
 ----------------------------------------------------------------
 MIT License

-Copyright (c) 2022 urfave/cli maintainers
+Copyright (c) 2023 urfave/cli maintainers

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@ -527,33 +505,6 @@ SOFTWARE.

 ================================================================

-github.com/xrash/smetrics
-https://github.com/xrash/smetrics
----------------------------------------------------------------
-Copyright (C) 2016 Felipe da Cunha Gonçalves
-All Rights Reserved.
-
-MIT LICENSE
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-================================================================
-
 golang.org/x/net
 https://golang.org/x/net
 ----------------------------------------------------------------
--- a/README.adoc
+++ b/README.adoc
@ -20,6 +20,7 @@ ghq get [-u] [-p] [--shallow] [--vcs <vcs>] [--look] [--silent] [--branch] [--no
 ghq list [-p] [-e] [<query>]
 ghq create [--vcs <vcs>] <repository URL>|<host>/<user>/<project>|<user>/<project>|<project>
 ghq rm [--dry-run] <repository URL>|<host>/<user>/<project>|<user>/<project>|<project>
+ghq migrate [-y] [--dry-run] <local repository path>
 ghq root [--all]

 == COMMANDS
@ -67,6 +68,11 @@ rm::
 create::
    Creates new repository.

+migrate::
+    Migrate an existing repository directory to the ghq-managed directory structure.
+    The command detects the VCS backend, retrieves the remote URL, and moves
+    the repository to the appropriate location under ghq root.
+
 == CONFIGURATION

 Configuration uses 'git-config' variables.
@ -92,6 +98,11 @@ ghq.completeUser::
    `vim` as `github.com/vim/vim`, and `peco` as `github.com/peco/peco`.
    If you prefer this behavior, set this option to `false` to switch the owner completion method.

+ghq.defaultHost::
+    The default host used when the repository specification omits the host.
+    For example, `ghq get owner/project` normally resolves to `github.com/owner/project`.
+    If this option is set, the specified host will be used instead.
+
 ghq.<url>.vcs::
    ghq tries to detect the remote repository's VCS backend for non-"github.com"
    repositories.  With this option you can explicitly specify the VCS for the
@ -106,6 +117,10 @@ ghq.<url>.root::
    you can specify a repository-specific root directory instead of the common ghq root directory. +
    The URL is matched against '<url>' using 'git config --get-urlmatch'.

+Since `ghq get` runs `git clone` for Git repositories, git's own configuration applies as
+well. For example, `clone.defaultRemoteName` changes the name of the created remote, which
+is `origin` by default. +
+To get this configuration variable effective, you will need Git 2.30 or higher.

 === Example configuration (.gitconfig):

@ -193,6 +208,13 @@ mise install ghq
 mise use ghq
 ----

+=== https://github.com/nixos/nixpkgs[nixpkgs]
+
+----
+nix run nixpkgs#ghq # run ghq once
+nix profile install nixpkgs#ghq # install ghq to your profile
+----
+
 === build

 ----
--- a/cmd_create.go
+++ b/cmd_create.go
@ -1,19 +1,20 @@
 package main

 import (
+	"context"
 	"fmt"
 	"io"
 	"os"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )

-func doCreate(c *cli.Context) error {
+func doCreate(ctx context.Context, cmd *cli.Command) error {
 	var (
-		name = c.Args().First()
-		vcs  = c.String("vcs")
-		w    = c.App.Writer
-		bare = c.Bool("bare")
+		name = cmd.Args().First()
+		vcs  = cmd.String("vcs")
+		w    = cmd.Root().Writer
+		bare = cmd.Bool("bare")
 	)

 	if name == "" {
--- a/cmd_create_test.go
+++ b/cmd_create_test.go
@ -1,6 +1,7 @@
 package main

 import (
+	"context"
 	"errors"
 	"os"
 	"os/exec"
@ -128,7 +129,7 @@ func TestDoCreate(t *testing.T) {

 			var err error
 			out, _, _ := capture(func() {
-				err = newApp().Run(append([]string{""}, tc.input...))
+				err = newApp().Run(context.Background(), append([]string{""}, tc.input...))
 			})
 			out = strings.TrimSpace(out)

--- a/cmd_get.go
+++ b/cmd_get.go
@ -2,6 +2,7 @@ package main

 import (
 	"bufio"
+	"context"
 	"errors"
 	"fmt"
 	"io"
@ -13,29 +14,29 @@ import (
 	"sync"

 	"github.com/mattn/go-isatty"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 	"github.com/x-motemen/ghq/cmdutil"
 	"github.com/x-motemen/ghq/logger"
 	"golang.org/x/sync/errgroup"
 )

-func doGet(c *cli.Context) error {
+func doGet(ctx context.Context, cmd *cli.Command) error {
 	var (
-		args     = c.Args().Slice()
-		andLook  = c.Bool("look")
-		parallel = c.Bool("parallel")
-		silent   = c.Bool("silent")
+		args     = cmd.Args().Slice()
+		andLook  = cmd.Bool("look")
+		parallel = cmd.Bool("parallel")
+		silent   = cmd.Bool("silent")
 	)
 	g := &getter{
-		update:    c.Bool("update"),
-		shallow:   c.Bool("shallow"),
-		ssh:       c.Bool("p"),
-		vcs:       c.String("vcs"),
+		update:    cmd.Bool("update"),
+		shallow:   cmd.Bool("shallow"),
+		ssh:       cmd.Bool("p"),
+		vcs:       cmd.String("vcs"),
 		silent:    silent,
-		branch:    c.String("branch"),
-		recursive: !c.Bool("no-recursive"),
-		bare:      c.Bool("bare"),
-		partial:   c.String("partial"),
+		branch:    cmd.String("branch"),
+		recursive: !cmd.Bool("no-recursive"),
+		bare:      cmd.Bool("bare"),
+		partial:   cmd.String("partial"),
 	}
 	if parallel {
 		// force silent in parallel import
@ -74,15 +75,25 @@ func doGet(c *cli.Context) error {
 			sem <- struct{}{}
 			eg.Go(func() error {
 				defer func() { <-sem }()
-				if getInfo, err = g.get(target); err != nil {
-					logger.Logf("error", "failed to get %q: %s", target, err)
+				info, getErr := g.get(ctx, target)
+				getInfo, err = info, getErr
+				if getErr != nil {
+					logger.Logf("error", "failed to get %q: %s", target, getErr)
+				} else if info.localRepository != nil {
+					fmt.Println(info.localRepository.FullPath)
 				}
 				return nil
 			})
 		} else {
-			if getInfo, err = g.get(target); err != nil {
+			if getInfo, err = g.get(ctx, target); err != nil {
 				return fmt.Errorf("failed to get %q: %w", target, err)
 			}
+			if getInfo.localRepository != nil {
+				if !silent {
+					fmt.Fprintln(os.Stderr, "Got the repo to the following:")
+				}
+				fmt.Println(getInfo.localRepository.FullPath)
+			}
 		}
 	}
 	if err = scr.Err(); err != nil {
--- a/cmd_get_test.go
+++ b/cmd_get_test.go
@ -2,6 +2,7 @@ package main

 import (
 	"bytes"
+	"context"
 	"fmt"
 	"os"
 	"os/exec"
@ -26,7 +27,7 @@ func TestCommandGet(t *testing.T) {
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

-			app.Run([]string{"", "get", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "motemen/ghq-test-repo"})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -53,7 +54,7 @@ func TestCommandGet(t *testing.T) {
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

-			app.Run([]string{"", "get", "-p", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "-p", "motemen/ghq-test-repo"})

 			expect := "ssh://git@github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -73,7 +74,7 @@ func TestCommandGet(t *testing.T) {
 			// mark as "already cloned", the condition may change later
 			os.MkdirAll(filepath.Join(localDir, ".git"), 0755)

-			app.Run([]string{"", "get", "-update", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "-update", "motemen/ghq-test-repo"})

 			if updateArgs.local != localDir {
 				t.Errorf("got: %s, expect: %s", updateArgs.local, localDir)
@ -84,7 +85,7 @@ func TestCommandGet(t *testing.T) {
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

-			app.Run([]string{"", "get", "-shallow", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "-shallow", "motemen/ghq-test-repo"})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -106,7 +107,7 @@ func TestCommandGet(t *testing.T) {
 			os.Chdir(localDir)
 			defer os.Chdir(wd)

-			app.Run([]string{"", "get", "-update", "." + string(filepath.Separator) + "ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "-update", "." + string(filepath.Separator) + "ghq-test-repo"})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -126,7 +127,7 @@ func TestCommandGet(t *testing.T) {
 			os.Chdir(localDir)
 			defer os.Chdir(wd)

-			app.Run([]string{"", "get", "-update", ".." + string(filepath.Separator) + "ghq-another-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "-update", ".." + string(filepath.Separator) + "ghq-another-test-repo"})

 			expect := "https://github.com/motemen/ghq-another-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -143,7 +144,7 @@ func TestCommandGet(t *testing.T) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

 			expectBranch := "hello"
-			app.Run([]string{"", "get", "-shallow", "-branch", expectBranch, "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "-shallow", "-branch", expectBranch, "motemen/ghq-test-repo"})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -162,7 +163,7 @@ func TestCommandGet(t *testing.T) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

 			expectBranch := "hello"
-			app.Run([]string{"", "get", "-shallow", "motemen/ghq-test-repo@" + expectBranch})
+			app.Run(context.Background(), []string{"", "get", "-shallow", "motemen/ghq-test-repo@" + expectBranch})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -178,7 +179,7 @@ func TestCommandGet(t *testing.T) {
 	}, {
 		name: "with --no-recursive option",
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
-			app.Run([]string{"", "get", "--no-recursive", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "--no-recursive", "motemen/ghq-test-repo"})

 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")
 			if filepath.ToSlash(cloneArgs.local) != filepath.ToSlash(localDir) {
@ -196,7 +197,7 @@ func TestCommandGet(t *testing.T) {
 [ghq "https://github.com/motemen"]
  root = "%s"
 `, filepath.ToSlash(tmpd))))
-			app.Run([]string{"", "get", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "motemen/ghq-test-repo"})

 			localDir := filepath.Join(tmpd, "github.com", "motemen", "ghq-test-repo")
 			if filepath.ToSlash(cloneArgs.local) != filepath.ToSlash(localDir) {
@ -208,7 +209,7 @@ func TestCommandGet(t *testing.T) {
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo.git")

-			app.Run([]string{"", "get", "--bare", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "--bare", "motemen/ghq-test-repo"})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -227,7 +228,7 @@ func TestCommandGet(t *testing.T) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

 			out, _, err := captureWithInput([]string{}, func() {
-				app.Run([]string{"", "get", "--silent", "motemen/ghq-test-repo"})
+				app.Run(context.Background(), []string{"", "get", "--silent", "motemen/ghq-test-repo"})
 			})
 			if err != nil {
 				t.Errorf("error should be nil, but: %s", err)
@ -244,8 +245,8 @@ func TestCommandGet(t *testing.T) {
 			if !cloneArgs.silent {
 				t.Errorf("cloneArgs.silent should be true")
 			}
-			if out != "" {
-				t.Errorf("silent mode should not output any logs, but got: %s", out)
+			if !strings.Contains(out, localDir) {
+				t.Errorf("silent mode should still print local path to stdout, but got: %q", out)
 			}
 		},
 	}, {
@ -253,7 +254,7 @@ func TestCommandGet(t *testing.T) {
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

-			app.Run([]string{"", "get", "--partial", "blobless", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "--partial", "blobless", "motemen/ghq-test-repo"})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -271,7 +272,7 @@ func TestCommandGet(t *testing.T) {
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
 			localDir := filepath.Join(tmpRoot, "github.com", "motemen", "ghq-test-repo")

-			app.Run([]string{"", "get", "--partial", "treeless", "motemen/ghq-test-repo"})
+			app.Run(context.Background(), []string{"", "get", "--partial", "treeless", "motemen/ghq-test-repo"})

 			expect := "https://github.com/motemen/ghq-test-repo"
 			if cloneArgs.remote.String() != expect {
@ -287,7 +288,7 @@ func TestCommandGet(t *testing.T) {
 	}, {
 		name: "[partial] unacceptable value",
 		scenario: func(t *testing.T, tmpRoot string, cloneArgs *_cloneArgs, updateArgs *_updateArgs) {
-			err := app.Run([]string{"", "get", "--partial", "unacceptable", "motemen/ghq-test-repo"})
+			err := app.Run(context.Background(), []string{"", "get", "--partial", "unacceptable", "motemen/ghq-test-repo"})

 			expect := "flag partial value \"unacceptable\" is not allowed"
 			if err.Error() != expect {
@ -303,6 +304,106 @@ func TestCommandGet(t *testing.T) {
 	}
 }

+func TestCommandGet_printPath(t *testing.T) {
+	testCases := []struct {
+		name       string
+		args       []string
+		inputRepos []string
+	}{{
+		name:       "single repo",
+		args:       []string{"", "get", "motemen/ghq-test-repo"},
+		inputRepos: nil,
+	}, {
+		name:       "bulk from stdin",
+		args:       []string{"", "get"},
+		inputRepos: []string{"github.com/x-motemen/ghq", "github.com/motemen/gore"},
+	}, {
+		name:       "bulk parallel",
+		args:       []string{"", "get", "--parallel"},
+		inputRepos: []string{"github.com/x-motemen/ghq", "github.com/motemen/gore"},
+	}}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			withFakeGitBackend(t, func(t *testing.T, tmpRoot string, _ *_cloneArgs, _ *_updateArgs) {
+				// pre-create dirs for bulk cases
+				for _, r := range tc.inputRepos {
+					os.MkdirAll(filepath.Join(tmpRoot, r, ".git"), 0755)
+				}
+
+				var out string
+				var err error
+				if len(tc.inputRepos) > 0 {
+					out, _, err = captureWithInput(tc.inputRepos, func() {
+						newApp().Run(context.Background(), tc.args)
+					})
+				} else {
+					out, _, err = capture(func() {
+						newApp().Run(context.Background(), tc.args)
+					})
+				}
+				if err != nil {
+					t.Fatalf("capture error: %s", err)
+				}
+
+				lines := strings.Split(strings.TrimRight(out, "\n"), "\n")
+				if len(tc.inputRepos) == 0 {
+					// single repo: output should contain the local path
+					if len(lines) != 1 || lines[0] == "" {
+						t.Errorf("expected one path in output, got: %q", out)
+					}
+					if !filepath.IsAbs(lines[0]) {
+						t.Errorf("expected absolute path, got: %q", lines[0])
+					}
+				} else {
+					// bulk: one path per repo
+					if len(lines) != len(tc.inputRepos) {
+						t.Errorf("expected %d paths, got %d: %q", len(tc.inputRepos), len(lines), out)
+					}
+					for _, line := range lines {
+						if !filepath.IsAbs(line) {
+							t.Errorf("expected absolute path, got: %q", line)
+						}
+					}
+				}
+			})
+		})
+	}
+}
+
+func TestCommandGet_gotMessage(t *testing.T) {
+	t.Run("prints 'Got the repo to the following:' to stderr", func(t *testing.T) {
+		withFakeGitBackend(t, func(t *testing.T, tmpRoot string, _ *_cloneArgs, _ *_updateArgs) {
+			_, errOut, err := capture(func() {
+				newApp().Run(context.Background(), []string{"", "get", "motemen/ghq-test-repo"})
+			})
+			if err != nil {
+				t.Fatalf("capture error: %s", err)
+			}
+			if !strings.Contains(errOut, "Got the repo to the following:") {
+				t.Errorf("expected stderr to contain 'Got the repo to the following:', got: %q", errOut)
+			}
+		})
+	})
+
+	t.Run("suppresses message with --silent but still prints path to stdout", func(t *testing.T) {
+		withFakeGitBackend(t, func(t *testing.T, tmpRoot string, _ *_cloneArgs, _ *_updateArgs) {
+			out, errOut, err := capture(func() {
+				newApp().Run(context.Background(), []string{"", "get", "--silent", "motemen/ghq-test-repo"})
+			})
+			if err != nil {
+				t.Fatalf("capture error: %s", err)
+			}
+			if strings.Contains(errOut, "Got the repo to the following:") {
+				t.Errorf("expected stderr not to contain 'Got the repo to the following:' with --silent, got: %q", errOut)
+			}
+			if !filepath.IsAbs(strings.TrimRight(out, "\n")) {
+				t.Errorf("expected absolute path in stdout, got: %q", out)
+			}
+		})
+	})
+}
+
 func TestLook(t *testing.T) {
 	withFakeGitBackend(t, func(t *testing.T, tmproot string, _ *_cloneArgs, _ *_updateArgs) {
 		os.MkdirAll(filepath.Join(tmproot, "github.com", "motemen", "ghq", ".git"), 0755)
@ -318,7 +419,7 @@ func TestLook(t *testing.T) {
 		}
 		sh := detectShell()

-		err := newApp().Run([]string{"", "get", "--look", "https://github.com/motemen/ghq"})
+		err := newApp().Run(context.Background(), []string{"", "get", "--look", "https://github.com/motemen/ghq"})
 		if err != nil {
 			t.Errorf("error should be nil, but: %s", err)
 		}
@ -364,7 +465,7 @@ func TestBareLook(t *testing.T) {
 		}
 		sh := detectShell()

-		err := newApp().Run([]string{"", "get", "--bare", "--look", "https://github.com/motemen/ghq.git"})
+		err := newApp().Run(context.Background(), []string{"", "get", "--bare", "--look", "https://github.com/motemen/ghq.git"})
 		if err != nil {
 			t.Errorf("error should be nil, but: %s", err)
 		}
@ -426,15 +527,18 @@ func TestDoGet_bulk(t *testing.T) {
 				buf.Reset()
 				out, _, err := captureWithInput(in, func() {
 					args := append([]string{"", "get"}, tc.args...)
-					if err := newApp().Run(args); err != nil {
+					if err := newApp().Run(context.Background(), args); err != nil {
 						t.Errorf("error should be nil but: %s", err)
 					}
 				})
 				if err != nil {
 					t.Errorf("error should be nil, but: %s", err)
 				}
-				if out != "" {
-					t.Errorf("out should be empty, but: %s", out)
+				for _, r := range in {
+					expectedPath := filepath.Join(tmproot, r)
+					if !strings.Contains(out, expectedPath) {
+						t.Errorf("out should contain %q, but got: %s", expectedPath, out)
+					}
 				}
 				log := filepath.ToSlash(buf.String())
 				for _, r := range in {
--- a/cmd_list.go
+++ b/cmd_list.go
@ -1,24 +1,25 @@
 package main

 import (
+	"context"
 	"fmt"
 	"path/filepath"
 	"sort"
 	"strings"
 	"sync"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )

-func doList(c *cli.Context) error {
+func doList(ctx context.Context, cmd *cli.Command) error {
 	var (
-		w                = c.App.Writer
-		query            = c.Args().First()
-		exact            = c.Bool("exact")
-		vcsBackend       = c.String("vcs")
-		printFullPaths   = c.Bool("full-path")
-		printUniquePaths = c.Bool("unique")
-		bare             = c.Bool("bare")
+		w                = cmd.Root().Writer
+		query            = cmd.Args().First()
+		exact            = cmd.Bool("exact")
+		vcsBackend       = cmd.String("vcs")
+		printFullPaths   = cmd.Bool("full-path")
+		printUniquePaths = cmd.Bool("unique")
+		bare             = cmd.Bool("bare")
 	)

 	filterByQuery := func(_ *LocalRepository) bool {
--- a/cmd_list_test.go
+++ b/cmd_list_test.go
@ -1,7 +1,7 @@
 package main

 import (
-	"flag"
+	"context"
 	"os"
 	"path/filepath"
 	"runtime"
@ -9,26 +9,11 @@ import (
 	"strings"
 	"sync"
 	"testing"
-
-	"github.com/urfave/cli/v2"
 )

-func flagSet(name string, flags []cli.Flag) *flag.FlagSet {
-	set := flag.NewFlagSet(name, flag.ContinueOnError)
-
-	for _, f := range flags {
-		f.Apply(set)
-	}
-	return set
-}
-
 func TestCommandList(t *testing.T) {
 	_, _, err := capture(func() {
-		app := cli.NewApp()
-		flagSet := flagSet("list", commandList.Flags)
-		c := cli.NewContext(app, flagSet, nil)
-
-		doList(c)
+		newApp().Run(context.Background(), []string{"ghq", "list"})
 	})

 	if err != nil {
@ -38,12 +23,7 @@ func TestCommandList(t *testing.T) {

 func TestCommandListUnique(t *testing.T) {
 	_, _, err := capture(func() {
-		app := cli.NewApp()
-		flagSet := flagSet("list", commandList.Flags)
-		flagSet.Parse([]string{"--unique"})
-		c := cli.NewContext(app, flagSet, nil)
-
-		doList(c)
+		newApp().Run(context.Background(), []string{"ghq", "list", "--unique"})
 	})

 	if err != nil {
@ -53,12 +33,7 @@ func TestCommandListUnique(t *testing.T) {

 func TestCommandListUnknown(t *testing.T) {
 	_, _, err := capture(func() {
-		app := cli.NewApp()
-		flagSet := flagSet("list", commandList.Flags)
-		flagSet.Parse([]string{"--unknown-flag"})
-		c := cli.NewContext(app, flagSet, nil)
-
-		doList(c)
+		newApp().Run(context.Background(), []string{"ghq", "list", "--unknown-flag"})
 	})

 	if err != nil {
@ -158,7 +133,7 @@ func TestDoList_query(t *testing.T) {
 			t.Run(tc.name, func(t *testing.T) {
 				args := append([]string{"ghq", "list"}, tc.args...)
 				out, _, _ := capture(func() {
-					newApp().Run(args)
+					newApp().Run(context.Background(), args)
 				})
 				if !equalPathLines(out, tc.expect) {
 					t.Errorf("got:\n%s\nexpect:\n%s", out, tc.expect)
@ -177,7 +152,7 @@ func TestDoList_query(t *testing.T) {
 					fullExpect += "\n"
 				}
 				out, _, _ = capture(func() {
-					newApp().Run(argsFull)
+					newApp().Run(context.Background(), argsFull)
 				})
 				if !equalPathLines(out, fullExpect) {
 					t.Errorf("got:\n%s\nexpect:\n%s", out, fullExpect)
@ -201,7 +176,7 @@ func TestDoList_unique(t *testing.T) {
 		os.MkdirAll(filepath.Join(rootPath, "github.com/motemen/ghq/.git"), 0755)
 	}
 	out, _, _ := capture(func() {
-		newApp().Run([]string{"ghq", "list", "--unique"})
+		newApp().Run(context.Background(), []string{"ghq", "list", "--unique"})
 	})
 	if out != "ghq\n" {
 		t.Errorf("got: %s, expect: ghq\n", out)
@ -214,7 +189,7 @@ func TestDoList_unknownRoot(t *testing.T) {
 	_localRepositoryRoots = nil
 	localRepoOnce = &sync.Once{}

-	err := newApp().Run([]string{"ghq", "list"})
+	err := newApp().Run(context.Background(), []string{"ghq", "list"})
 	if err != nil {
 		t.Errorf("error should be nil, but: %v", err)
 	}
@ -233,7 +208,7 @@ func TestDoList_notPermittedRoot(t *testing.T) {
 	localRepoOnce = &sync.Once{}
 	os.Chmod(tmpdir, 0000)

-	err := newApp().Run([]string{"ghq", "list"})
+	err := newApp().Run(context.Background(), []string{"ghq", "list"})
 	if err != nil {
 		t.Errorf("error should be nil, but: %+v", err)
 	}
@ -253,7 +228,7 @@ func TestDoList_withSystemHiddenDir(t *testing.T) {
 	_localRepositoryRoots = nil
 	localRepoOnce = &sync.Once{}

-	err := newApp().Run([]string{"ghq", "list"})
+	err := newApp().Run(context.Background(), []string{"ghq", "list"})
 	if err != nil {
 		t.Errorf("error should be nil, but: %v", err)
 	}
--- a/cmd_migrate.go
+++ b/cmd_migrate.go
@ -1,21 +1,25 @@
 package main

 import (
+	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strings"
+	"syscall"

-	"github.com/urfave/cli/v2"
+	"github.com/otiai10/copy"
+	"github.com/urfave/cli/v3"
+	"github.com/x-motemen/ghq/logger"
 )

-func doMigrate(c *cli.Context) error {
+func doMigrate(ctx context.Context, cmd *cli.Command) error {
 	var (
-		repoDir     = c.Args().First()
-		dry         = c.Bool("dry-run")
-		skipConfirm = c.Bool("y")
-		w           = c.App.Writer
+		repoDir     = cmd.Args().First()
+		dry         = cmd.Bool("dry-run")
+		skipConfirm = cmd.Bool("y")
+		w           = cmd.Root().Writer
 	)

 	if repoDir == "" {
@ -41,15 +45,24 @@ func doMigrate(c *cli.Context) error {
 		return fmt.Errorf("failed to detect VCS backend in %q", absDir)
 	}

-	// Get remote URL (currently only git is supported)
-	var remoteURL string
+	// Refuse to migrate a linked Git checkout (worktree or submodule).
+	// These have a .git file referencing a parent repo; moving them alone
+	// breaks the link.
 	if vcsBackend == GitBackend {
-		remoteURL, err = getGitRemoteURL(absDir)
-		if err != nil {
-			return fmt.Errorf("failed to get remote URL: %w", err)
+		if linked, target, err := isLinkedGitDir(absDir); err != nil {
+			return fmt.Errorf("failed to check .git link status: %w", err)
+		} else if linked {
+			return fmt.Errorf("directory %q has a .git file linking to %q; it is a worktree or submodule and cannot be migrated independently", absDir, target)
 		}
-	} else {
-		return fmt.Errorf("only git repositories are currently supported")
+	}
+
+	// Get remote URL
+	if vcsBackend.RemoteURL == nil {
+		return fmt.Errorf("migrate is not supported for this VCS backend")
+	}
+	remoteURL, err := vcsBackend.RemoteURL(absDir)
+	if err != nil {
+		return fmt.Errorf("failed to get remote URL: %w", err)
 	}

 	// Parse the remote URL
@ -78,9 +91,21 @@ func doMigrate(c *cli.Context) error {
 		return fmt.Errorf("failed to check destination directory: %w", err)
 	}

+	// Check for linked worktrees before dry-run return so we can report them
+	var hasWorktrees bool
+	if vcsBackend == GitBackend {
+		hasWorktrees, err = hasLinkedWorktrees(absDir)
+		if err != nil {
+			return fmt.Errorf("failed to check for linked worktrees: %w", err)
+		}
+	}
+
 	// Dry-run mode
 	if dry {
 		fmt.Fprintf(w, "Would migrate %s to %s\n", absDir, destPath)
+		if hasWorktrees {
+			fmt.Fprintf(w, "Would run 'git worktree repair' to update linked worktrees\n")
+		}
 		return nil
 	}

@ -102,54 +127,79 @@ func doMigrate(c *cli.Context) error {
 	}

 	// Move the repository
-	if err := os.Rename(absDir, destPath); err != nil {
+	if err := moveDir(absDir, destPath); err != nil {
 		return fmt.Errorf("failed to move repository: %w", err)
 	}

+	// Repair linked worktrees so their .git files reference the new location.
+	//
+	// For each worktree, two pointers exist:
+	//   back-pointer:    .git/worktrees/<name>/gitdir  → worktree working dir
+	//   forward ref:     <worktree>/.git               → main repo's .git/worktrees/<name>
+	//
+	// External worktrees (outside the repo) didn't move, so only the forward
+	// ref is stale. Internal worktrees (inside the repo) moved along with
+	// the repo, so BOTH pointers are stale. We fix the back-pointers first
+	// so that "git worktree repair" can match entries to update the forward refs.
+	if hasWorktrees {
+		wtPaths, wtErr := repairWorktreeBackPointers(absDir, destPath)
+		if wtErr != nil {
+			logger.Log("warning", fmt.Sprintf("failed to discover linked worktree paths: %v", wtErr))
+		} else if len(wtPaths) > 0 {
+			args := append([]string{"worktree", "repair"}, wtPaths...)
+			cmd := exec.Command("git", args...)
+			cmd.Dir = destPath
+			if out, err := cmd.CombinedOutput(); err != nil {
+				logger.Log("warning", fmt.Sprintf("git worktree repair failed: %v\n%s", err, out))
+			}
+		}
+	}
+
 	fmt.Fprintln(w, destPath)
 	return nil
 }

-// getGitRemoteURL retrieves the remote URL from a git repository
-// It tries 'origin' first, then falls back to the first remote
-func getGitRemoteURL(repoDir string) (string, error) {
-	// Try to get the URL of 'origin' remote
-	cmd := exec.Command("git", "remote", "get-url", "origin")
-	cmd.Dir = repoDir
-	output, err := cmd.Output()
-	if err == nil {
-		url := strings.TrimSpace(string(output))
-		if url != "" {
-			return url, nil
+// moveDir attempts to move directory from src to dst, with fallback for cross-device moves
+func moveDir(src, dst string) error {
+	// Try atomic rename first
+	renameErr := os.Rename(src, dst)
+	if renameErr == nil {
+		return nil
+	}
+
+	// Check for cross-device error
+	var linkError *os.LinkError
+	isCrossDevice := errors.As(renameErr, &linkError) && errors.Is(linkError.Err, syscall.EXDEV)
+
+	if !isCrossDevice {
+		return renameErr
+	}
+
+	// Fallback: copy directory tree using otiai10/copy, then remove source
+	opt := copy.Options{
+		// Preserve symlinks as-is
+		OnSymlink: func(src string) copy.SymlinkAction {
+			return copy.Shallow
+		},
+		// Skip special files (pipes, sockets, devices) as they're uncommon in repos
+		Skip: func(srcinfo os.FileInfo, src, dest string) (bool, error) {
+			mode := srcinfo.Mode()
+			// Skip if not regular file, directory, or symlink
+			if !mode.IsRegular() && !mode.IsDir() && mode&os.ModeSymlink == 0 {
+				return true, nil
+			}
+			return false, nil
+		},
+	}
+
+	copyErr := copy.Copy(src, dst, opt)
+	if copyErr != nil {
+		// Attempt to cleanup partial copy
+		if cleanupErr := os.RemoveAll(dst); cleanupErr != nil {
+			return fmt.Errorf("copy failed: %w (cleanup also failed: %v)", copyErr, cleanupErr)
 		}
+		return copyErr
 	}

-	// Fall back to the first remote
-	cmd = exec.Command("git", "remote")
-	cmd.Dir = repoDir
-	output, err = cmd.Output()
-	if err != nil {
-		return "", fmt.Errorf("failed to list remotes: %w", err)
-	}
-
-	remotes := strings.Split(strings.TrimSpace(string(output)), "\n")
-	if len(remotes) == 0 || remotes[0] == "" {
-		return "", fmt.Errorf("no remotes found")
-	}
-
-	// Get URL of the first remote
-	firstRemote := remotes[0]
-	cmd = exec.Command("git", "remote", "get-url", firstRemote)
-	cmd.Dir = repoDir
-	output, err = cmd.Output()
-	if err != nil {
-		return "", fmt.Errorf("failed to get URL of remote %q: %w", firstRemote, err)
-	}
-
-	url := strings.TrimSpace(string(output))
-	if url == "" {
-		return "", fmt.Errorf("remote %q has no URL", firstRemote)
-	}
-
-	return url, nil
+	return os.RemoveAll(src)
 }
--- a/cmd_migrate_test.go
+++ b/cmd_migrate_test.go
@ -1,13 +1,46 @@
 package main

 import (
+	"context"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"sync"
 	"testing"
 )

+// initGitRepo creates a git repo at dir with the given remote URL and an
+// initial empty commit. It returns dir for convenience.
+func initGitRepo(t *testing.T, dir, remoteURL string) string {
+	t.Helper()
+	os.MkdirAll(dir, 0755)
+
+	for _, args := range [][]string{
+		{"init"},
+		{"remote", "add", "origin", remoteURL},
+		{"-c", "user.name=test", "-c", "user.email=test@test.com",
+			"commit", "--allow-empty", "-m", "init"},
+	} {
+		c := exec.Command("git", args...)
+		c.Dir = dir
+		if out, err := c.CombinedOutput(); err != nil {
+			t.Fatalf("git %s: %v\n%s", args[0], err, out)
+		}
+	}
+	return dir
+}
+
+// addWorktree creates a git worktree at wtDir branching from the repo at repoDir.
+func addWorktree(t *testing.T, repoDir, wtDir, branch string) {
+	t.Helper()
+	c := exec.Command("git", "worktree", "add", "-b", branch, wtDir)
+	c.Dir = repoDir
+	if out, err := c.CombinedOutput(); err != nil {
+		t.Fatalf("git worktree add: %v\n%s", err, out)
+	}
+}
+
 // Test for the migrate command
 func TestDoMigrate(t *testing.T) {
 	defer func(x string) { _home = x }(_home)
@ -33,7 +66,7 @@ func TestDoMigrate(t *testing.T) {
 		c2.Run()

 		a := newApp()
-		e := a.Run([]string{"ghq", "migrate", "-y", srcdir})
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", srcdir})
 		if e != nil {
 			t.Fatal(e)
 		}
@ -47,7 +80,7 @@ func TestDoMigrate(t *testing.T) {
 	// Test case: nonexistent directory
 	t.Run("migrate_nonexist", func(t *testing.T) {
 		a := newApp()
-		e := a.Run([]string{"ghq", "migrate", "-y", "/does/not/exist"})
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", "/does/not/exist"})
 		if e == nil {
 			t.Error("expected error")
 		}
@ -67,7 +100,7 @@ func TestDoMigrate(t *testing.T) {
 		c2.Run()

 		a := newApp()
-		e := a.Run([]string{"ghq", "migrate", "--dry-run", srcdir})
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "--dry-run", srcdir})
 		if e != nil {
 			t.Fatal(e)
 		}
@ -76,6 +109,107 @@ func TestDoMigrate(t *testing.T) {
 			t.Error("source should still exist")
 		}
 	})
+
+	// Test case: migrate repo with linked worktrees repairs forward references
+	t.Run("migrate_with_linked_worktrees", func(t *testing.T) {
+		srcdir := initGitRepo(t, filepath.Join(tmpdir, "sources_wt", "main"),
+			"https://github.com/wt-user/main.git")
+		wtDir := filepath.Join(tmpdir, "sources_wt", "wt")
+		addWorktree(t, srcdir, wtDir, "wt-branch")
+
+		a := newApp()
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", srcdir})
+		if e != nil {
+			t.Fatal(e)
+		}
+
+		dest := filepath.Join(tmpdir, "github.com", "wt-user", "main")
+		if _, err := os.Stat(dest); os.IsNotExist(err) {
+			t.Error("dest not found")
+		}
+
+		// Verify worktree's .git file has exact gitdir: reference to new location
+		content, err := os.ReadFile(filepath.Join(wtDir, ".git"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		wantGitdir := "gitdir: " + filepath.ToSlash(filepath.Join(dest, ".git", "worktrees", "wt"))
+		if got := strings.TrimSpace(string(content)); got != wantGitdir {
+			t.Errorf("worktree .git:\n  got:  %s\n  want: %s", got, wantGitdir)
+		}
+
+		// Verify git status works in the worktree after migration
+		c := exec.Command("git", "status")
+		c.Dir = wtDir
+		if out, err := c.CombinedOutput(); err != nil {
+			t.Errorf("git status in worktree failed after migration: %v\n%s", err, out)
+		}
+	})
+
+	// Test case: dry run with linked worktrees mentions repair
+	t.Run("migrate_dryrun_with_worktrees", func(t *testing.T) {
+		srcdir := initGitRepo(t, filepath.Join(tmpdir, "sources_wt_dry", "main"),
+			"https://github.com/wt-dry/proj.git")
+		wtDir := filepath.Join(tmpdir, "sources_wt_dry", "wt")
+		addWorktree(t, srcdir, wtDir, "wt-dry-branch")
+
+		out, _, err := capture(func() {
+			a := newApp()
+			a.Run(context.Background(), []string{"ghq", "migrate", "--dry-run", srcdir})
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !strings.Contains(out, "Would migrate") {
+			t.Errorf("expected dry-run migration message, got: %s", out)
+		}
+		if !strings.Contains(out, "worktree repair") {
+			t.Errorf("expected worktree repair mention in dry-run, got: %s", out)
+		}
+		if _, err := os.Stat(srcdir); os.IsNotExist(err) {
+			t.Error("source should still exist in dry-run mode")
+		}
+	})
+
+	// Test case: worktree inside the repo directory moves along with it
+	t.Run("migrate_with_internal_worktree", func(t *testing.T) {
+		srcdir := initGitRepo(t, filepath.Join(tmpdir, "sources_wt_int", "main"),
+			"https://github.com/wt-int/proj.git")
+		// Create worktree INSIDE the repo directory
+		wtDir := filepath.Join(srcdir, ".worktrees", "feat")
+		addWorktree(t, srcdir, wtDir, "wt-int-branch")
+
+		a := newApp()
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", srcdir})
+		if e != nil {
+			t.Fatal(e)
+		}
+
+		dest := filepath.Join(tmpdir, "github.com", "wt-int", "proj")
+		if _, err := os.Stat(dest); os.IsNotExist(err) {
+			t.Error("dest not found")
+		}
+
+		// The worktree moved with the repo — verify its .git file
+		// has exact gitdir: reference to the new main repo location
+		newWtDir := filepath.Join(dest, ".worktrees", "feat")
+		content, err := os.ReadFile(filepath.Join(newWtDir, ".git"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		wantGitdir := "gitdir: " + filepath.ToSlash(filepath.Join(dest, ".git", "worktrees", "feat"))
+		if got := strings.TrimSpace(string(content)); got != wantGitdir {
+			t.Errorf("internal worktree .git:\n  got:  %s\n  want: %s", got, wantGitdir)
+		}
+
+		// Verify git status works in the internal worktree after migration
+		c := exec.Command("git", "status")
+		c.Dir = newWtDir
+		if out, err := c.CombinedOutput(); err != nil {
+			t.Errorf("git status in internal worktree failed after migration: %v\n%s", err, out)
+		}
+	})
 }

 func TestMigrateEdgeCases(t *testing.T) {
@ -93,7 +227,7 @@ func TestMigrateEdgeCases(t *testing.T) {
 		os.MkdirAll(srcdir, 0755)

 		a := newApp()
-		e := a.Run([]string{"ghq", "migrate", "-y", srcdir})
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", srcdir})
 		if e == nil {
 			t.Error("should fail when no VCS found")
 		}
@ -108,7 +242,7 @@ func TestMigrateEdgeCases(t *testing.T) {
 		c.Run()

 		a := newApp()
-		e := a.Run([]string{"ghq", "migrate", "-y", srcdir})
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", srcdir})
 		if e == nil {
 			t.Error("should fail when no remote")
 		}
@ -130,9 +264,196 @@ func TestMigrateEdgeCases(t *testing.T) {
 		os.MkdirAll(dest, 0755)

 		a := newApp()
-		e := a.Run([]string{"ghq", "migrate", "-y", srcdir})
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", srcdir})
 		if e == nil {
 			t.Error("should fail when dest exists")
 		}
 	})
+
+	t.Run("migrate_worktree_refused", func(t *testing.T) {
+		srcdir := initGitRepo(t, filepath.Join(tmpdir, "src_wt_ref", "main"),
+			"https://github.com/wt-ref/proj.git")
+		wtDir := filepath.Join(tmpdir, "src_wt_ref", "wt")
+		addWorktree(t, srcdir, wtDir, "wt-ref-branch")
+
+		a := newApp()
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", wtDir})
+		if e == nil {
+			t.Fatal("expected error migrating a worktree")
+		}
+		if !strings.Contains(e.Error(), "worktree or submodule") {
+			t.Errorf("error should mention worktree or submodule, got: %v", e)
+		}
+		if !strings.Contains(e.Error(), ".git") {
+			t.Errorf("error should mention .git link target, got: %v", e)
+		}
+	})
+
+	t.Run("unsupported_vcs", func(t *testing.T) {
+		// Create a CVS repository structure to test unsupported VCS
+		srcdir := filepath.Join(tmpdir, "src6", "cvs-repo")
+		cvsDir := filepath.Join(srcdir, "CVS")
+		os.MkdirAll(cvsDir, 0755)
+
+		// Create a minimal CVS/Repository file
+		repoFile := filepath.Join(cvsDir, "Repository")
+		os.WriteFile(repoFile, []byte("test-repo\n"), 0644)
+
+		a := newApp()
+		e := a.Run(context.Background(), []string{"ghq", "migrate", "-y", srcdir})
+		if e == nil {
+			t.Error("should fail for unsupported VCS (CVS)")
+		}
+		// Check that the error message mentions unsupported VCS
+		if e != nil && !strings.Contains(e.Error(), "not supported") {
+			t.Errorf("expected 'not supported' error, got: %v", e)
+		}
+	})
+}
+
+func TestMoveDir(t *testing.T) {
+	tmpdir := newTempDir(t)
+
+	t.Run("move_same_device", func(t *testing.T) {
+		srcDir := filepath.Join(tmpdir, "move_src")
+		dstDir := filepath.Join(tmpdir, "move_dst")
+
+		os.MkdirAll(srcDir, 0755)
+		os.WriteFile(filepath.Join(srcDir, "testfile.txt"), []byte("test"), 0644)
+
+		if err := moveDir(srcDir, dstDir); err != nil {
+			t.Fatal(err)
+		}
+
+		// Verify destination exists
+		if _, err := os.Stat(dstDir); os.IsNotExist(err) {
+			t.Error("destination directory does not exist")
+		}
+
+		// Verify source is gone
+		if _, err := os.Stat(srcDir); !os.IsNotExist(err) {
+			t.Error("source directory still exists")
+		}
+
+		// Verify content
+		content, err := os.ReadFile(filepath.Join(dstDir, "testfile.txt"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		if string(content) != "test" {
+			t.Errorf("content mismatch: got %q, want %q", content, "test")
+		}
+	})
+
+	t.Run("move_with_subdirectories", func(t *testing.T) {
+		srcDir := filepath.Join(tmpdir, "move_src2")
+		dstDir := filepath.Join(tmpdir, "move_dst2")
+
+		os.MkdirAll(filepath.Join(srcDir, "sub1", "sub2"), 0755)
+		os.WriteFile(filepath.Join(srcDir, "root.txt"), []byte("root"), 0644)
+		os.WriteFile(filepath.Join(srcDir, "sub1", "file1.txt"), []byte("file1"), 0644)
+		os.WriteFile(filepath.Join(srcDir, "sub1", "sub2", "file2.txt"), []byte("file2"), 0644)
+
+		if err := moveDir(srcDir, dstDir); err != nil {
+			t.Fatal(err)
+		}
+
+		// Verify all files exist
+		files := []string{
+			"root.txt",
+			"sub1/file1.txt",
+			"sub1/sub2/file2.txt",
+		}
+		for _, f := range files {
+			path := filepath.Join(dstDir, f)
+			if _, err := os.Stat(path); os.IsNotExist(err) {
+				t.Errorf("file %s does not exist", f)
+			}
+		}
+
+		// Verify source is gone
+		if _, err := os.Stat(srcDir); !os.IsNotExist(err) {
+			t.Error("source directory still exists")
+		}
+	})
+
+	// Note: moveDir also has a cross-device (EXDEV) fallback path which is
+	// difficult to exercise reliably in unit tests because it depends on
+	// running across different filesystems. That behavior is validated in
+	// higher-level integration tests / environments that provide multiple
+	// mounts, rather than in this unit test.
+}
+
+func TestIsLinkedGitDir(t *testing.T) {
+	tmpdir := newTempDir(t)
+
+	t.Run("regular_repo", func(t *testing.T) {
+		dir := filepath.Join(tmpdir, "regular")
+		os.MkdirAll(dir, 0755)
+
+		c := exec.Command("git", "init")
+		c.Dir = dir
+		if out, err := c.CombinedOutput(); err != nil {
+			t.Fatalf("git init: %v\n%s", err, out)
+		}
+
+		linked, _, err := isLinkedGitDir(dir)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if linked {
+			t.Error("regular repo should not be detected as linked")
+		}
+	})
+
+	t.Run("no_git", func(t *testing.T) {
+		dir := filepath.Join(tmpdir, "nogit")
+		os.MkdirAll(dir, 0755)
+
+		linked, _, err := isLinkedGitDir(dir)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if linked {
+			t.Error("directory without .git should not be detected as linked")
+		}
+	})
+
+	t.Run("submodule_gitfile", func(t *testing.T) {
+		dir := filepath.Join(tmpdir, "submod")
+		os.MkdirAll(dir, 0755)
+
+		// Simulate a submodule's .git file pointing to .git/modules/
+		os.WriteFile(filepath.Join(dir, ".git"),
+			[]byte("gitdir: ../.git/modules/submod\n"), 0644)
+
+		linked, target, err := isLinkedGitDir(dir)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !linked {
+			t.Error("submodule should be detected as linked")
+		}
+		if !strings.Contains(target, "modules") {
+			t.Errorf("target should reference modules dir, got: %s", target)
+		}
+	})
+
+	t.Run("actual_worktree", func(t *testing.T) {
+		mainDir := initGitRepo(t, filepath.Join(tmpdir, "wt_main"),
+			"https://github.com/dummy/wt-main.git")
+		wtDir := filepath.Join(tmpdir, "wt_linked")
+		addWorktree(t, mainDir, wtDir, "wt-test")
+
+		linked, target, err := isLinkedGitDir(wtDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !linked {
+			t.Error("worktree should be detected as linked")
+		}
+		if !strings.Contains(target, "worktrees") {
+			t.Errorf("target should reference worktrees dir, got: %s", target)
+		}
+	})
 }
--- a/cmd_rm.go
+++ b/cmd_rm.go
@ -1,18 +1,22 @@
 package main

 import (
+	"context"
 	"fmt"
 	"os"
+	"os/exec"
+	"strings"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
+	"github.com/x-motemen/ghq/logger"
 )

-func doRm(c *cli.Context) error {
+func doRm(ctx context.Context, cmd *cli.Command) error {
 	var (
-		name = c.Args().First()
-		dry  = c.Bool("dry-run")
-		w    = c.App.Writer
-		bare = c.Bool("bare")
+		name = cmd.Args().First()
+		dry  = cmd.Bool("dry-run")
+		w    = cmd.Root().Writer
+		bare = cmd.Bool("bare")
 	)

 	if name == "" {
@ -38,12 +42,56 @@ func doRm(c *cli.Context) error {
 		return fmt.Errorf("directory %q does not exist", p)
 	}

+	// Scenario A: Is this path itself a linked worktree?
+	isWorktree := false
+	var gitdirTarget string
+	if linked, target, linkErr := isLinkedGitDir(p); linkErr != nil {
+		return fmt.Errorf("failed to check worktree status: %w", linkErr)
+	} else if linked && isWorktreeGitDir(target) {
+		isWorktree = true
+		gitdirTarget = target
+	}
+
+	// Scenario B: Does this repo have linked worktrees?
+	var worktreePaths []string
+	if !isWorktree {
+		if hasWt, wtErr := hasLinkedWorktrees(p); wtErr != nil {
+			return fmt.Errorf("failed to check for linked worktrees: %w", wtErr)
+		} else if hasWt {
+			worktreePaths, err = listLinkedWorktreePaths(p)
+			if err != nil {
+				return fmt.Errorf("failed to list linked worktrees: %w", err)
+			}
+		}
+	}
+
+	// Dry-run
 	if dry {
-		fmt.Fprintf(w, "Would remove %s\n", p)
+		if isWorktree {
+			fmt.Fprintf(w, "Would remove worktree %s (linked to %s)\n", p, gitdirTarget)
+		} else if len(worktreePaths) > 0 {
+			fmt.Fprintf(w, "Would remove %s and its %d linked worktree(s):\n", p, len(worktreePaths))
+			for _, wt := range worktreePaths {
+				fmt.Fprintf(w, "  %s\n", wt)
+			}
+		} else {
+			fmt.Fprintf(w, "Would remove %s\n", p)
+		}
 		return nil
 	}

-	ok, err = confirm(fmt.Sprintf("Remove %s?", p))
+	// Confirmation
+	var confirmMsg string
+	if isWorktree {
+		confirmMsg = fmt.Sprintf("Remove worktree %s?", p)
+	} else if len(worktreePaths) > 0 {
+		confirmMsg = fmt.Sprintf("Remove %s and its %d linked worktree(s)?\n  %s",
+			p, len(worktreePaths), strings.Join(worktreePaths, "\n  "))
+	} else {
+		confirmMsg = fmt.Sprintf("Remove %s?", p)
+	}
+
+	ok, err = confirm(confirmMsg)
 	if err != nil {
 		return err
 	}
@ -51,8 +99,48 @@ func doRm(c *cli.Context) error {
 		return fmt.Errorf("aborted")
 	}

-	if err := os.RemoveAll(p); err != nil {
-		return err
+	// Removal
+	if isWorktree {
+		// Use git worktree remove to properly unregister from parent repo.
+		// Resolve the main repo directory so we don't run git from inside
+		// the directory being deleted.
+		removed := false
+		if mainRepoDir, dirErr := resolveMainRepoDir(gitdirTarget); dirErr == nil {
+			gitCmd := exec.Command("git", "worktree", "remove", "--force", p)
+			gitCmd.Dir = mainRepoDir
+			if out, gitErr := gitCmd.CombinedOutput(); gitErr != nil {
+				logger.Log("warning", fmt.Sprintf("git worktree remove failed: %v\n%s", gitErr, out))
+			} else {
+				removed = true
+			}
+		} else {
+			logger.Log("warning", fmt.Sprintf("cannot resolve main repo dir: %v", dirErr))
+		}
+		if !removed {
+			logger.Log("warning", "falling back to direct removal")
+			if err := os.RemoveAll(p); err != nil {
+				return err
+			}
+			// Best-effort cleanup of dangling .git/worktrees/<name> entry
+			if gitdirTarget != "" {
+				os.RemoveAll(gitdirTarget)
+			}
+		}
+	} else {
+		// Prune linked worktrees before removing main repo
+		for _, wt := range worktreePaths {
+			if _, statErr := os.Stat(wt); os.IsNotExist(statErr) {
+				continue // already gone
+			}
+			gitCmd := exec.Command("git", "worktree", "remove", "--force", wt)
+			gitCmd.Dir = p
+			if out, gitErr := gitCmd.CombinedOutput(); gitErr != nil {
+				return fmt.Errorf("failed to remove worktree %s: %w\n%s", wt, gitErr, out)
+			}
+		}
+		if err := os.RemoveAll(p); err != nil {
+			return err
+		}
 	}

 	fmt.Fprintf(w, "Removed %s\n", p)
--- a/cmd_rm_test.go
+++ b/cmd_rm_test.go
@ -1,10 +1,12 @@
 package main

 import (
+	"context"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"sync"
 	"testing"

@ -39,13 +41,25 @@ func TestRmCommand(t *testing.T) {
 			name:  "simple",
 			input: []string{"rm", "motemen/ghqq"},
 			setup: func(t *testing.T) {
-				os.MkdirAll(filepath.Join(tmpd, "github.com", "motemen", "ghqq"), 0755)
+				if err := os.MkdirAll(filepath.Join(tmpd, "github.com", "motemen", "ghqq", ".git"), 0755); err != nil {
+					t.Fatal(err)
+				}
 			},
 			expectErr: false,
 		},
 		{
-			name:      "empty directory",
-			input:     []string{"rm", "motemen/ghqqq"},
+			name:  "empty directory",
+			input: []string{"rm", "motemen/ghqqq"},
+			setup: func(t *testing.T) {
+				if err := os.MkdirAll(filepath.Join(tmpd, "github.com", "motemen", "ghqqq"), 0755); err != nil {
+					t.Fatal(err)
+				}
+			},
+			expectErr: true,
+		},
+		{
+			name:      "missing directory",
+			input:     []string{"rm", "motemen/missing"},
 			setup:     func(t *testing.T) {},
 			expectErr: true,
 		},
@ -85,6 +99,21 @@ func TestRmCommand(t *testing.T) {
 			if tc.cmdRun != nil {
 				cmdutil.CommandRunner = tc.cmdRun
 			}
+
+			var runErr error
+			_, _, err := captureWithInput([]string{"y"}, func() {
+				a := newApp()
+				args := append([]string{"ghq"}, tc.input...)
+				runErr = a.Run(context.Background(), args)
+			})
+
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			if gotErr := runErr != nil; gotErr != tc.expectErr {
+				t.Fatalf("error = %v, expectErr = %v", runErr, tc.expectErr)
+			}
 		})
 	}
 }
@ -117,7 +146,9 @@ func TestRmDryRunCommand(t *testing.T) {
 			name:  "simple",
 			input: []string{"rm", "--dry-run", "motemen/ghqq"},
 			setup: func(t *testing.T) {
-				os.MkdirAll(filepath.Join(tmpd, "github.com", "motemen", "ghqq"), 0755)
+				if err := os.MkdirAll(filepath.Join(tmpd, "github.com", "motemen", "ghqq", ".git"), 0755); err != nil {
+					t.Fatal(err)
+				}
 			},
 			expectErr: false,
 		},
@ -137,9 +168,9 @@ func TestRmDryRunCommand(t *testing.T) {
 		},
 		{
 			name:  "permission denied",
-			input: []string{"rm", "--dry-run", "motemen/ghqq"},
+			input: []string{"rm", "--dry-run", "motemen/ghq-notpermitted"},
 			setup: func(t *testing.T) {
-				f := filepath.Join(tmpd, "github.com", "motemen", "ghqq")
+				f := filepath.Join(tmpd, "github.com", "motemen", "ghq-notpermitted")
 				os.MkdirAll(f, 0000)
 				t.Cleanup(func() {
 					os.Chmod(f, 0755)
@ -163,6 +194,182 @@ func TestRmDryRunCommand(t *testing.T) {
 			if tc.cmdRun != nil {
 				cmdutil.CommandRunner = tc.cmdRun
 			}
+
+			var runErr error
+			_, _, err := capture(func() {
+				a := newApp()
+				args := append([]string{"ghq"}, tc.input...)
+				runErr = a.Run(context.Background(), args)
+			})
+
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			if gotErr := runErr != nil; gotErr != tc.expectErr {
+				t.Fatalf("error = %v, expectErr = %v", runErr, tc.expectErr)
+			}
 		})
 	}
 }
+
+func TestRmWorktree(t *testing.T) {
+	defer func(orig func(cmd *exec.Cmd) error) {
+		cmdutil.CommandRunner = orig
+	}(cmdutil.CommandRunner)
+	cmdutil.CommandRunner = func(cmd *exec.Cmd) error { return nil }
+
+	defer func(orig string) { _home = orig }(_home)
+	_home = ""
+	homeOnce = &sync.Once{}
+	tmpd := newTempDir(t)
+	defer func(orig []string) { _localRepositoryRoots = orig }(_localRepositoryRoots)
+	setEnv(t, envGhqRoot, tmpd)
+	_localRepositoryRoots = nil
+	localRepoOnce = &sync.Once{}
+
+	t.Run("rm_linked_worktree", func(t *testing.T) {
+		// Create main repo inside ghq root
+		mainDir := initGitRepo(t, filepath.Join(tmpd, "github.com", "wt-rm", "main"),
+			"https://github.com/wt-rm/main.git")
+
+		// Create worktree registered under ghq root so ghq rm can resolve it
+		wtDir := filepath.Join(tmpd, "github.com", "wt-rm", "wt-linked")
+		addWorktree(t, mainDir, wtDir, "wt-rm-branch")
+
+		_, _, err := captureWithInput([]string{"y"}, func() {
+			a := newApp()
+			if e := a.Run(context.Background(), []string{"ghq", "rm", "wt-rm/wt-linked"}); e != nil {
+				t.Fatal(e)
+			}
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		// Worktree directory should be gone
+		if _, err := os.Stat(wtDir); !os.IsNotExist(err) {
+			t.Error("worktree directory should be removed")
+		}
+
+		// Parent repo's .git/worktrees/<name> should be cleaned up
+		wtEntry := filepath.Join(mainDir, ".git", "worktrees", "wt-linked")
+		if _, err := os.Stat(wtEntry); !os.IsNotExist(err) {
+			t.Error("parent repo's worktree entry should be cleaned up")
+		}
+
+		// Parent repo should still work
+		c := exec.Command("git", "status")
+		c.Dir = mainDir
+		if out, err := c.CombinedOutput(); err != nil {
+			t.Errorf("git status in parent repo failed: %v\n%s", err, out)
+		}
+	})
+
+	t.Run("rm_dryrun_worktree", func(t *testing.T) {
+		mainDir := initGitRepo(t, filepath.Join(tmpd, "github.com", "wt-dry", "main"),
+			"https://github.com/wt-dry/main.git")
+		wtDir := filepath.Join(tmpd, "github.com", "wt-dry", "wt-linked")
+		addWorktree(t, mainDir, wtDir, "wt-dry-branch")
+
+		out, _, err := capture(func() {
+			a := newApp()
+			if e := a.Run(context.Background(), []string{"ghq", "rm", "--dry-run", "wt-dry/wt-linked"}); e != nil {
+				t.Fatal(e)
+			}
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !strings.Contains(out, "Would remove worktree") {
+			t.Errorf("expected 'Would remove worktree' in output, got: %s", out)
+		}
+		if _, err := os.Stat(wtDir); os.IsNotExist(err) {
+			t.Error("worktree should still exist after dry-run")
+		}
+	})
+
+	t.Run("rm_repo_with_linked_worktrees", func(t *testing.T) {
+		mainDir := initGitRepo(t, filepath.Join(tmpd, "github.com", "wt-parent", "repo"),
+			"https://github.com/wt-parent/repo.git")
+
+		// Create two external worktrees
+		wt1 := filepath.Join(tmpd, "external-wt1")
+		wt2 := filepath.Join(tmpd, "external-wt2")
+		addWorktree(t, mainDir, wt1, "branch1")
+		addWorktree(t, mainDir, wt2, "branch2")
+
+		_, _, err := captureWithInput([]string{"y"}, func() {
+			a := newApp()
+			if e := a.Run(context.Background(), []string{"ghq", "rm", "wt-parent/repo"}); e != nil {
+				t.Fatal(e)
+			}
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		// Main repo should be gone
+		if _, err := os.Stat(mainDir); !os.IsNotExist(err) {
+			t.Error("main repo should be removed")
+		}
+
+		// Both worktree directories should be gone
+		if _, err := os.Stat(wt1); !os.IsNotExist(err) {
+			t.Error("worktree 1 should be removed")
+		}
+		if _, err := os.Stat(wt2); !os.IsNotExist(err) {
+			t.Error("worktree 2 should be removed")
+		}
+	})
+
+	t.Run("rm_dryrun_with_linked_worktrees", func(t *testing.T) {
+		mainDir := initGitRepo(t, filepath.Join(tmpd, "github.com", "wt-dry2", "repo"),
+			"https://github.com/wt-dry2/repo.git")
+
+		wt1 := filepath.Join(tmpd, "dry-wt1")
+		addWorktree(t, mainDir, wt1, "dry-branch1")
+
+		out, _, err := capture(func() {
+			a := newApp()
+			if e := a.Run(context.Background(), []string{"ghq", "rm", "--dry-run", "wt-dry2/repo"}); e != nil {
+				t.Fatal(e)
+			}
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !strings.Contains(out, "linked worktree") {
+			t.Errorf("expected 'linked worktree' in output, got: %s", out)
+		}
+		if _, err := os.Stat(mainDir); os.IsNotExist(err) {
+			t.Error("repo should still exist after dry-run")
+		}
+	})
+
+	t.Run("rm_repo_with_already_deleted_worktree", func(t *testing.T) {
+		mainDir := initGitRepo(t, filepath.Join(tmpd, "github.com", "wt-gone", "repo"),
+			"https://github.com/wt-gone/repo.git")
+
+		wt := filepath.Join(tmpd, "gone-wt")
+		addWorktree(t, mainDir, wt, "gone-branch")
+
+		// Manually delete the worktree directory (simulating user deleting it)
+		os.RemoveAll(wt)
+
+		_, _, err := captureWithInput([]string{"y"}, func() {
+			a := newApp()
+			if e := a.Run(context.Background(), []string{"ghq", "rm", "wt-gone/repo"}); e != nil {
+				t.Fatal(e)
+			}
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		// Main repo should be gone regardless
+		if _, err := os.Stat(mainDir); !os.IsNotExist(err) {
+			t.Error("main repo should be removed even with pre-deleted worktree")
+		}
+	})
+}
--- a/cmd_root.go
+++ b/cmd_root.go
@ -1,22 +1,23 @@
 package main

 import (
+	"context"
 	"fmt"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )

-func doRoot(c *cli.Context) error {
+func doRoot(ctx context.Context, cmd *cli.Command) error {
 	roots, err := localRepositoryRoots(true)
 	if err != nil {
 		return err
 	}
-	if !c.Bool("all") {
+	if !cmd.Bool("all") {
 		roots = roots[:1] // only the first root is needed
 	}

 	for _, root := range roots {
-		_, err := fmt.Fprintln(c.App.Writer, root)
+		_, err := fmt.Fprintln(cmd.Root().Writer, root)
 		if err != nil {
 			return err
 		}
--- a/cmd_root_test.go
+++ b/cmd_root_test.go
@ -1,6 +1,7 @@
 package main

 import (
+	"context"
 	"os"
 	"path/filepath"
 	"runtime"
@ -90,13 +91,13 @@ func TestDoRoot(t *testing.T) {
 			homeOnce = &sync.Once{}
 			tc.setup(t)
 			out, _, _ := capture(func() {
-				newApp().Run([]string{"", "root"})
+				newApp().Run(context.Background(), []string{"", "root"})
 			})
 			if !samePaths(out, tc.expect) {
 				t.Errorf("got: %s, expect: %s", out, tc.expect)
 			}
 			out, _, _ = capture(func() {
-				newApp().Run([]string{"", "root", "--all"})
+				newApp().Run(context.Background(), []string{"", "root", "--all"})
 			})
 			if !samePaths(out, tc.allExpect) {
 				t.Errorf("got: %s, expect: %s", out, tc.allExpect)
--- a/commands.go
+++ b/commands.go
@ -1,11 +1,12 @@
 package main

 import (
+	"context"
 	"fmt"
 	"slices"
 	"strings"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )

 var commands = []*cli.Command{
@ -43,7 +44,7 @@ var commandGet = &cli.Command{
 		&cli.StringFlag{
 			Name:  "partial",
 			Usage: "Do a partial clone. Can specify either \"blobless\" or \"treeless\"",
-			Action: func(ctx *cli.Context, v string) error {
+			Action: func(ctx context.Context, cmd *cli.Command, v string) error {
 				expected := []string{"blobless", "treeless"}
 				if !slices.Contains(expected, v) {
 					return fmt.Errorf("flag partial value \"%v\" is not allowed", v)
--- a/getter.go
+++ b/getter.go
@ -1,6 +1,7 @@
 package main

 import (
+	"context"
 	"fmt"
 	"net/url"
 	"os"
@ -28,7 +29,7 @@ type getter struct {
 	vcs, branch, partial                          string
 }

-func (g *getter) get(argURL string) (getInfo, error) {
+func (g *getter) get(ctx context.Context, argURL string) (getInfo, error) {
 	u, err := newURL(argURL, g.ssh, false)
 	if err != nil {
 		return getInfo{}, fmt.Errorf("could not parse URL %q: %w", argURL, err)
@ -42,13 +43,13 @@ func (g *getter) get(argURL string) (getInfo, error) {
 		return getInfo{}, err
 	}

-	return g.getRemoteRepository(remote, branch)
+	return g.getRemoteRepository(ctx, remote, branch)
 }

 // getRemoteRepository clones or updates a remote repository remote.
 // If doUpdate is true, updates the locally cloned repository. Otherwise does nothing.
 // If isShallow is true, does shallow cloning. (no effect if already cloned or the VCS is Mercurial and git-svn)
-func (g *getter) getRemoteRepository(remote RemoteRepository, branch string) (getInfo, error) {
+func (g *getter) getRemoteRepository(ctx context.Context, remote RemoteRepository, branch string) (getInfo, error) {
 	remoteURL := remote.URL()
 	local, err := LocalRepositoryFromURL(remoteURL, g.bare)
 	if err != nil {
@ -149,8 +150,8 @@ func detectLocalRepoRoot(remotePath, repoPath string) string {
 	pathParts = pathParts[1:]
 	for i := 0; i < len(pathParts); i++ {
 		subPath := "/" + path.Join(pathParts[i:]...)
-		if subIdx := strings.Index(remotePath, subPath); subIdx >= 0 {
-			return remotePath[0:subIdx] + subPath
+		if before, _, ok := strings.Cut(remotePath, subPath); ok {
+			return before + subPath
 		}
 	}
 	return ""
--- a/go.mod
+++ b/go.mod
@ -1,32 +1,29 @@
 module github.com/x-motemen/ghq

-go 1.25.0
-
-toolchain go1.25.6
+go 1.26.0

 require (
 	github.com/Songmu/gitconfig v0.2.2
-	github.com/mattn/go-isatty v0.0.20
+	github.com/mattn/go-isatty v0.0.22
 	github.com/motemen/go-colorine v0.0.0-20180816141035-45d19169413a
+	github.com/otiai10/copy v1.14.1
 	github.com/saracen/walker v0.1.4
-	github.com/urfave/cli/v2 v2.27.7
-	golang.org/x/net v0.49.0
-	golang.org/x/sync v0.19.0
+	github.com/urfave/cli/v3 v3.10.1
+	golang.org/x/net v0.57.0
+	golang.org/x/sync v0.22.0
 )

 require (
 	github.com/cli/go-gh/v2 v2.13.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
+	github.com/otiai10/mint v1.6.3 // indirect
 )

 require (
 	github.com/cli/safeexec v1.0.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/daviddengcn/go-colortext v1.0.0 // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
-	golang.org/x/sys v0.40.0 // indirect
-	golang.org/x/text v0.33.0
+	golang.org/x/sys v0.47.0 // indirect
+	golang.org/x/text v0.40.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -4,8 +4,6 @@ github.com/cli/go-gh/v2 v2.13.0 h1:jEHZu/VPVoIJkciK3pzZd3rbT8J90swsK5Ui4ewH1ys=
 github.com/cli/go-gh/v2 v2.13.0/go.mod h1:Us/NbQ8VNM0fdaILgoXSz6PKkV5PWaEzkJdc9vR2geM=
 github.com/cli/safeexec v1.0.1 h1:e/C79PbXF4yYTN/wauC4tviMxEV13BwljGj0N9j+N00=
 github.com/cli/safeexec v1.0.1/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
-github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
-github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -22,31 +20,30 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
+github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
 github.com/motemen/go-colorine v0.0.0-20180816141035-45d19169413a h1:CONqI/36EjYzkAzrMD0UWuL/lRDr7UdoID4fDGke+Yc=
 github.com/motemen/go-colorine v0.0.0-20180816141035-45d19169413a/go.mod h1:PU2urRC7j30rrabSyp1MGGhyoiWSninPD8ckjzBSgkU=
+github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
+github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
+github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
+github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/saracen/walker v0.1.4 h1:/WCOt98GRkQ0KgL6hXJFBpoH21XY6iCD2N6LQWBFiaU=
 github.com/saracen/walker v0.1.4/go.mod h1:2F+hfOidTHfXP2AmlKOqpO+yewf8fIvNUDBNJogpJbk=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
-github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
-github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
-github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
-golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
-golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
-golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/urfave/cli/v3 v3.10.1 h1:7Kx9H50hrHbRbyxgO1KP6/BcbiGRz0uYh5YyQ30JEEY=
+github.com/urfave/cli/v3 v3.10.1/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
+golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
+golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
+golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
+golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
+golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/local_repository.go
+++ b/local_repository.go
@ -6,6 +6,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"sync"

@ -166,7 +167,7 @@ func (repo *LocalRepository) repoRootCandidates() []string {
 	hostRoot := filepath.Join(repo.RootPath, repo.PathParts[0])
 	nonHostParts := repo.PathParts[1:]
 	candidates := make([]string, len(nonHostParts))
-	for i := 0; i < len(nonHostParts); i++ {
+	for i := range nonHostParts {
 		candidates[i] = filepath.Join(append(
 			[]string{hostRoot}, nonHostParts[0:len(nonHostParts)-i]...)...)
 	}
@ -184,13 +185,7 @@ func (repo *LocalRepository) IsUnderPrimaryRoot() bool {

 // Matches checks if any subpath of the local repository equals the query.
 func (repo *LocalRepository) Matches(pathQuery string) bool {
-	for _, p := range repo.Subpaths() {
-		if p == pathQuery {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(repo.Subpaths(), pathQuery)
 }

 // VCS returns VCSBackend of the repository
--- a/logger/log.go
+++ b/logger/log.go
@ -71,6 +71,6 @@ func Log(prefix, message string) {
 }

 // Logf outputs log with format
-func Logf(prefix, msg string, args ...interface{}) {
+func Logf(prefix, msg string, args ...any) {
 	Log(prefix, fmt.Sprintf(msg, args...))
 }
--- a/main.go
+++ b/main.go
@ -1,19 +1,20 @@
 package main

 import (
+	"context"
 	"fmt"
 	"os"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 	"github.com/x-motemen/ghq/logger"
 )

-const version = "1.9.0"
+const version = "1.10.1"

 var revision = "HEAD"

 func main() {
-	if err := newApp().Run(os.Args); err != nil {
+	if err := newApp().Run(context.Background(), os.Args); err != nil {
 		exitCode := 1
 		if excoder, ok := err.(cli.ExitCoder); ok {
 			exitCode = excoder.ExitCode()
@ -23,18 +24,13 @@ func main() {
 	}
 }

-func newApp() *cli.App {
-	app := cli.NewApp()
-	app.Name = "ghq"
-	app.Usage = "Manage remote repository clones"
-	app.Version = fmt.Sprintf("%s (rev:%s)", version, revision)
-	app.Authors = []*cli.Author{{
-		Name:  "motemen",
-		Email: "motemen@gmail.com",
-	}, {
-		Name:  "Songmu",
-		Email: "y.songmu@gmail.com",
-	}}
-	app.Commands = commands
-	return app
+func newApp() *cli.Command {
+	return &cli.Command{
+		Name:     "ghq",
+		Usage:    "Manage remote repository clones",
+		Version:  fmt.Sprintf("%s (rev:%s)", version, revision),
+		Authors:  []any{"motemen <motemen@gmail.com>", "Songmu <y.songmu@gmail.com>"},
+		Suggest:  true,
+		Commands: commands,
+	}
 }
--- a/misc/bash/_ghq
+++ b/misc/bash/_ghq
@ -1,21 +1,84 @@
-function _ghq () {
+_ghq() {
  local cur prev words cword
  _init_completion || return

-  case $cword in
-  1)
-    COMPREPLY=( $(compgen -W "get list rm" -- $cur) );;
-  2)
-    case $prev in
-    get)
-  	  COMPREPLY=( $(compgen -W "$(ghq list --unique)" -- $cur) );;
+  local subcommands="get clone list root rm create migrate help"
+  local global_opts="--help -h"
+
+  if [[ $cword = 1 ]]; then
+    COMPREPLY=( $(compgen -W "$subcommands $global_opts --version -v" -- "$cur") )
+    return 0
+  fi
+
+  local vcs_backends="git github codecommit svn subversion git-svn hg mercurial darcs pijul fossil bzr bazaar"
+
+  case "${words[1]}" in
+    get|clone)
+      local opts="--update -u -p --shallow --look -l --vcs --silent -s --no-recursive --branch -b --parallel -P --bare --partial"
+      if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W "$opts $global_opts" -- "$cur") )
+        return 0
+      fi
+      case "$prev" in
+        --branch|-b)
+          # expects branch name
+          ;;
+        --partial)
+          COMPREPLY=( $(compgen -W "blobless treeless" -- "$cur") );;
+        --vcs)
+          COMPREPLY=( $(compgen -W "$vcs_backends" -- "$cur") );;
+        *)
+          local arg
+          for arg in "${words[@]}"; do
+            case "$arg" in
+              --update|-u)
+                COMPREPLY=( $(compgen -W "$(ghq list)" -- "$cur") )
+                break;;
+            esac
+          done;;
+      esac;;
    list)
-  	  COMPREPLY=( $(compgen -W "$(ghq list)" -- $cur) );;
+      local opts="--exact -e --vcs --full-path -p --unique --bare"
+      if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W "$opts $global_opts" -- "$cur") )
+        return 0
+      fi
+      case "$prev" in
+        --vcs)
+          COMPREPLY=( $(compgen -W "$vcs_backends" -- "$cur") );;
+      esac;;
+    root)
+      local opts="--all"
+      if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W "$opts $global_opts" -- "$cur") )
+        return 0
+      fi;;
    rm)
-  	  COMPREPLY=( $(compgen -W "$(ghq list)" -- $cur) );;
-    esac;;
-  *)
-    COMPREPLY=( $(compgen -W "$(ls)" -- $cur) );;
+      local opts="--dry-run --bare"
+      if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W "$opts $global_opts" -- "$cur") )
+        return 0
+      fi
+      COMPREPLY=( $(compgen -W "$(ghq list)" -- "$cur") );;
+    create)
+      local opts="--vcs --bare"
+      if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W "$opts $global_opts" -- "$cur") )
+        return 0
+      fi
+      case "$prev" in
+        --vcs)
+          COMPREPLY=( $(compgen -W "$vcs_backends" -- "$cur") );;
+      esac;;
+    migrate)
+      local opts="-y --dry-run"
+      if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W "$opts $global_opts" -- "$cur") )
+        return 0
+      fi
+      _filedir -d;;
+    help)
+      COMPREPLY=( $(compgen -W "$subcommands $global_opts" -- "$cur") );;
  esac
 }

--- a/misc/fish/ghq.fish
+++ b/misc/fish/ghq.fish
@ -1,6 +1,6 @@
 function __fish_ghq_needs_subcommand
    set -l cmd (commandline -opc)
-    for subcmd in get list rm root create h help
+    for subcmd in get clone list rm root create migrate h help
        if contains -- $subcmd $cmd
            return 1
        end
@ -18,47 +18,57 @@ complete -c ghq -s h -l help -d 'Show help'
 complete -c ghq -n __fish_ghq_needs_subcommand -s v -l version -d 'Print the version'

 # Global subcommands
-complete -c ghq -n __fish_ghq_needs_subcommand -a get -d 'Clone/sync with a remote repository'
+complete -c ghq -n __fish_ghq_needs_subcommand -a 'get clone' -d 'Clone/sync with a remote repository'
 complete -c ghq -n __fish_ghq_needs_subcommand -a list -d 'List local repositories'
 complete -c ghq -n __fish_ghq_needs_subcommand -a rm -d 'Remove local repository'
 complete -c ghq -n __fish_ghq_needs_subcommand -a root -d 'Show repositories\' root'
 complete -c ghq -n __fish_ghq_needs_subcommand -a create -d 'Create a new repository'
+complete -c ghq -n __fish_ghq_needs_subcommand -a migrate -d 'Migrate existing repository to ghq-managed directory'
 complete -c ghq -n __fish_ghq_needs_subcommand -a 'h help' -d 'Shows a list of commands or help for one command'

 # Arguments for subcommands
-complete -c ghq -n '__fish_seen_subcommand_from get' -s u -l update -d 'Update local repository if cloned already'
-complete -c ghq -n '__fish_seen_subcommand_from get' -s p -d 'Clone with SSH'
-complete -c ghq -n '__fish_seen_subcommand_from get' -l shallow -d 'Do a shallow clone'
-complete -c ghq -n '__fish_seen_subcommand_from get' -s l -l look -d 'Look after get'
-complete -c ghq -n '__fish_seen_subcommand_from get' -l vcs -d 'Specify vcs backend for cloning'
-complete -c ghq -n '__fish_seen_subcommand_from get' -s s -l silent -d 'Clone or update silently'
-complete -c ghq -n '__fish_seen_subcommand_from get' -l no-recursive -d 'Prevent recursive fetching'
-complete -c ghq -n '__fish_seen_subcommand_from get' -s b -l branch -d 'Specify branch name. This flag implies --single-branch on Git'
-complete -c ghq -n '__fish_seen_subcommand_from get' -s P -l parallel -d 'Import parallelly'
-complete -c ghq -n '__fish_seen_subcommand_from get' -l bare -d 'Do a bare clone'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -s u -l update -d 'Update local repository if cloned already'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -s p -d 'Clone with SSH'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -l shallow -d 'Do a shallow clone'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -s l -l look -d 'Look after get'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -l vcs -d 'Specify vcs backend for cloning'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -s s -l silent -d 'Clone or update silently'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -l no-recursive -d 'Prevent recursive fetching'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -s b -l branch -d 'Specify branch name. This flag implies --single-branch on Git'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -s P -l parallel -d 'Import parallelly'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -l bare -d 'Do a bare clone'
 function __complete_get_partial
    printf '%s\t%s\n' 'blobless' 'Do a blobless clone'
    printf '%s\t%s\n' 'treeless' 'Do a treeless clone'
 end
-complete -c ghq -n '__fish_seen_subcommand_from get' -l partial -d 'Do a partial clone' -xa '(__complete_get_partial)'
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -l partial -d 'Do a partial clone' -xa '(__complete_get_partial)'
+# When updating an existing repository (-u/--update), complete with local repositories
+complete -c ghq -n '__fish_seen_subcommand_from get clone' -n '__fish_seen_argument -s u -l update' -xa '(ghq list)'

 complete -c ghq -n '__fish_seen_subcommand_from list' -s e -l exact -d 'Perform an exact match'
 complete -c ghq -n '__fish_seen_subcommand_from list' -l vcs -d 'Specify vcs backend for matching'
 complete -c ghq -n '__fish_seen_subcommand_from list' -s p -l full-path -d 'Print full paths'
 complete -c ghq -n '__fish_seen_subcommand_from list' -l unique -d 'Print unique subpaths'
+complete -c ghq -n '__fish_seen_subcommand_from list' -l bare -d 'Query bare repositories'

 complete -c ghq -n '__fish_seen_subcommand_from rm' -l dry-run -d 'Do not remove actually'
+complete -c ghq -n '__fish_seen_subcommand_from rm' -l bare -d 'Remove a bare repository'
+complete -c ghq -n '__fish_seen_subcommand_from rm' -xa '(ghq list)'

 complete -c ghq -n '__fish_seen_subcommand_from root' -l all -d 'Show all roots'

 complete -c ghq -n '__fish_seen_subcommand_from create' -l vcs -d 'Specify vcs backend explicitly'
+complete -c ghq -n '__fish_seen_subcommand_from create' -l bare -d 'Create a bare repository'
+
+complete -c ghq -n '__fish_seen_subcommand_from migrate' -s y -d 'Skip confirmation prompt'
+complete -c ghq -n '__fish_seen_subcommand_from migrate' -l dry-run -d 'Show what would happen without moving'

 # Complete VCS backend options for supported subcommands
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'git github codecommit' -d git
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'svn subversion' -d subversion
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a git-svn -d git-svn
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'hg mercurial' -d mercurial
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a darcs -d darcs
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a pijul -d pijul
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a fossil -d fossil
-complete -c ghq -n '__fish_seen_subcommand_from get list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'bzr bazaar' -d bazaar
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'git github codecommit' -d git
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'svn subversion' -d subversion
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a git-svn -d git-svn
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'hg mercurial' -d mercurial
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a darcs -d darcs
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a pijul -d pijul
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a fossil -d fossil
+complete -c ghq -n '__fish_seen_subcommand_from get clone list create' -n '__fish_seen_argument --vcs' -l vcs -x -a 'bzr bazaar' -d bazaar
--- a/misc/zsh/_ghq
+++ b/misc/zsh/_ghq
@ -1,4 +1,4 @@
-#compdef ghq
+#compdef ghq ghq-dev

 function _ghq () {
    local context curcontext=$curcontext state line
@ -15,13 +15,13 @@ function _ghq () {
    case $state in
        (args)
            case $words[1] in
-                (get)
+                (get|clone)
                    _arguments -C \
                        '(-u --update)'{-u,--update}'[Update local repository if cloned already]' \
                        '-p[Clone with SSH]' \
                        '--shallow[Do a shallow clone]' \
                        '(-l --look)'{-l,--look}'[Look after get]' \
-                        '--vcs[Specify vcs backend for cloning]' \
+                        '--vcs[Specify vcs backend for cloning]: :(git github codecommit svn subversion git-svn hg mercurial darcs pijul fossil bzr bazaar)' \
                        '(-s --silent)'{-s,--silent}'[Clone or update silently]' \
                        '--no-recursive[Prevent recursive fetching]' \
                        '--bare[Do a bare clone]' \
@ -30,13 +30,17 @@ function _ghq () {
                        '--partial[Do a partial clone]: :(blobless treeless)' \
                        '(-)*:: :->null_state' \
                        && ret=0
+                    if (( ${words[(I)-u]} )) || (( ${words[(I)--update]} )); then
+                        __ghq_all_repositories && ret=0
+                    fi
                    ;;
                (list)
                    _arguments -C \
                        '(-e --exact)'{-e,--exact}'[Perform an exact match]' \
-                        '--vcs[Specify vcs backend for matching]' \
+                        '--vcs[Specify vcs backend for matching]: :(git github codecommit svn subversion git-svn hg mercurial darcs pijul fossil bzr bazaar)' \
                        '(-p --full-path)'{-p,--full-path}'[Print full paths]' \
                        '--unique[Print unique subpaths]' \
+                        '--bare[Query bare repositories]' \
                        '(-)*:: :->null_state' \
                        && ret=0
                    ;;
@ -48,14 +52,23 @@ function _ghq () {
                    ;;
                (create)
                    _arguments -C \
-                        '--vcs[Specify vcs backend explicitly]' \
+                        '--vcs[Specify vcs backend explicitly]: :(git github codecommit svn subversion git-svn hg mercurial darcs pijul fossil bzr bazaar)' \
+                        '--bare[Create a bare repository]' \
                        '(-)*:: :->null_state' \
                        && ret=0
                    ;;
                (rm)
                    _arguments -C \
                        '--dry-run[Do not remove actually]' \
-                        '(-)*:: :->null_state' \
+                        '--bare[Remove a bare repository]' \
+                        '(-)*: :__ghq_all_repositories' \
+                        && ret=0
+                    ;;
+                (migrate)
+                    _arguments -C \
+                        '-y[Skip confirmation prompt]' \
+                        '--dry-run[Show what would happen without moving]' \
+                        ':repository directory:_directories' \
                        && ret=0
                    ;;
                (help|h)
@ -74,14 +87,24 @@ __ghq_repositories () {
    _describe -t repositories Repositories _repos
 }

+__ghq_all_repositories () {
+    local -a _repos
+    _repos=( ${(@f)"$(_call_program repositories ghq list)"} )
+    _describe -t repositories Repositories _repos
+}
+
 __ghq_commands () {
    local -a _c
    _c=(
        'get:Clone/sync with a remote repository'
+        'clone:Clone/sync with a remote repository'
        'list:List local repositories'
+        'rm:Remove local repository'
        'create:Create a new repository'
+        'migrate:Migrate existing repository to ghq-managed directory'
        "root:Show repositories' root"
        'help:Show a list of commands or help for one command'
+        'h:Show a list of commands or help for one command'
    )

    _describe -t commands Commands _c
--- a/url.go
+++ b/url.go
@ -139,7 +139,12 @@ func newURL(ref string, ssh, forceMe bool) (*url.URL, error) {
 			}
 		}
 		u.Scheme = "https"
-		u.Host = "github.com"
+		host, err := gitconfig.Get("ghq.defaultHost")
+		if (err != nil && !gitconfig.IsNotFound(err)) || host != "" {
+			u.Host = host
+		} else {
+			u.Host = "github.com"
+		}
 		if u.Path[0] != '/' {
 			u.Path = "/" + u.Path
 		}
--- a/url_test.go
+++ b/url_test.go
@ -66,6 +66,15 @@ completeUser = false`))
 		url:    "peco",
 		expect: "https://github.com/peco/peco",
 		host:   "github.com",
+	}, {
+		name: "configured default host",
+		setup: func(t *testing.T) {
+			t.Cleanup(gitconfig.WithConfig(t, `[ghq]
+defaultHost = gitlab.com`))
+		},
+		url:    "gnuwget/wget2",
+		expect: "https://gitlab.com/gnuwget/wget2",
+		host:   "gitlab.com",
 	}}

 	for _, tc := range testCases {
--- a/vcs.go
+++ b/vcs.go
@ -38,6 +38,9 @@ type VCSBackend struct {
 	Init   func(dir string) error
 	// Returns VCS specific files
 	Contents []string
+	// Returns the remote URL of the repository at the given directory.
+	// If nil, the VCS backend does not support retrieving remote URLs.
+	RemoteURL func(dir string) (string, error)
 }

 type vcsGetOption struct {
@ -47,6 +50,50 @@ type vcsGetOption struct {
 	branch, partial                  string
 }

+// getGitRemoteURL retrieves the remote URL from a git repository.
+// It tries 'origin' first, then falls back to the first remote.
+func getGitRemoteURL(dir string) (string, error) {
+	// Try 'origin' first
+	originCmd := exec.Command("git", "remote", "get-url", "origin")
+	originCmd.Dir = dir
+	originOut, originErr := originCmd.Output()
+	if originErr == nil {
+		originURL := strings.TrimSpace(string(originOut))
+		if originURL != "" {
+			return originURL, nil
+		}
+	}
+
+	// List all remotes
+	listCmd := exec.Command("git", "remote")
+	listCmd.Dir = dir
+	listOut, listErr := listCmd.Output()
+	if listErr != nil {
+		return "", fmt.Errorf("failed to list remotes: %w", listErr)
+	}
+
+	allRemotes := strings.Split(strings.TrimSpace(string(listOut)), "\n")
+	if len(allRemotes) == 0 || allRemotes[0] == "" {
+		return "", fmt.Errorf("no remotes found")
+	}
+
+	// Get first remote URL
+	first := allRemotes[0]
+	urlCmd := exec.Command("git", "remote", "get-url", first)
+	urlCmd.Dir = dir
+	urlOut, urlErr := urlCmd.Output()
+	if urlErr != nil {
+		return "", fmt.Errorf("failed to get URL of remote %q: %w", first, urlErr)
+	}
+
+	finalURL := strings.TrimSpace(string(urlOut))
+	if finalURL == "" {
+		return "", fmt.Errorf("remote %q has no URL", first)
+	}
+
+	return finalURL, nil
+}
+
 // GitBackend is the VCSBackend of git
 var GitBackend = &VCSBackend{
 	// support submodules?
@ -111,6 +158,9 @@ var GitBackend = &VCSBackend{
 		return cmdutil.RunInDir(dir, "git", args...)
 	},
 	Contents: []string{".git"},
+	RemoteURL: func(dir string) (string, error) {
+		return getGitRemoteURL(dir)
+	},
 }

 /*
@ -143,8 +193,8 @@ func replaceOnce(reg *regexp.Regexp, str, replace string) string {
 }

 func svnBase(p string) string {
-	if strings.HasSuffix(p, trunk) {
-		return strings.TrimSuffix(p, trunk)
+	if before, ok := strings.CutSuffix(p, trunk); ok {
+		return before
 	}
 	return replaceOnce(svnReg, p, "")
 }
@ -184,6 +234,19 @@ var SubversionBackend = &VCSBackend{
 		return runInDir(vg.silent)(vg.dir, "svn", "update")
 	},
 	Contents: []string{".svn"},
+	RemoteURL: func(dir string) (string, error) {
+		cmd := exec.Command("svn", "info", "--show-item", "repos-root-url")
+		cmd.Dir = dir
+		output, err := cmd.Output()
+		if err != nil {
+			return "", fmt.Errorf("failed to get repository root URL: %w", err)
+		}
+		url := strings.TrimSpace(string(output))
+		if url == "" {
+			return "", fmt.Errorf("repository root URL is empty")
+		}
+		return url, nil
+	},
 }

 var svnLastRevReg = regexp.MustCompile(`(?m)^Last Changed Rev: (\d+)$`)
@ -251,6 +314,10 @@ var GitsvnBackend = &VCSBackend{
 		return runInDir(vg.silent)(vg.dir, "git", "svn", "rebase")
 	},
 	Contents: []string{".git/svn"},
+	RemoteURL: func(dir string) (string, error) {
+		// git-svn repos are git repos, use git remote logic
+		return getGitRemoteURL(dir)
+	},
 }

 // MercurialBackend is the VCSBackend for mercurial
@ -277,6 +344,19 @@ var MercurialBackend = &VCSBackend{
 		return cmdutil.RunInDir(dir, "hg", "init")
 	},
 	Contents: []string{".hg"},
+	RemoteURL: func(dir string) (string, error) {
+		cmd := exec.Command("hg", "paths", "default")
+		cmd.Dir = dir
+		output, err := cmd.Output()
+		if err != nil {
+			return "", fmt.Errorf("failed to get default path: %w", err)
+		}
+		url := strings.TrimSpace(string(output))
+		if url == "" {
+			return "", fmt.Errorf("default path is empty")
+		}
+		return url, nil
+	},
 }

 // DarcsBackend is the VCSBackend for darcs
@ -307,6 +387,27 @@ var DarcsBackend = &VCSBackend{
 		return cmdutil.RunInDir(dir, "darcs", "init")
 	},
 	Contents: []string{"_darcs"},
+	RemoteURL: func(dir string) (string, error) {
+		cmd := exec.Command("darcs", "show", "repo")
+		cmd.Dir = dir
+		output, err := cmd.Output()
+		if err != nil {
+			return "", fmt.Errorf("failed to show repo: %w", err)
+		}
+		lines := strings.SplitSeq(string(output), "\n")
+		for line := range lines {
+			if strings.HasPrefix(strings.TrimSpace(line), "Default Remote:") {
+				parts := strings.SplitN(line, ":", 2)
+				if len(parts) == 2 {
+					url := strings.TrimSpace(parts[1])
+					if url != "" {
+						return url, nil
+					}
+				}
+			}
+		}
+		return "", fmt.Errorf("no default remote found")
+	},
 }

 // PijulBackend is the VCSBackend for pijul
@ -333,6 +434,23 @@ var PijulBackend = &VCSBackend{
 		return cmdutil.RunInDir(dir, "pijul", "init")
 	},
 	Contents: []string{".pijul"},
+	RemoteURL: func(dir string) (string, error) {
+		cmd := exec.Command("pijul", "remote")
+		cmd.Dir = dir
+		output, err := cmd.Output()
+		if err != nil {
+			return "", fmt.Errorf("failed to list remotes: %w", err)
+		}
+		lines := strings.SplitSeq(strings.TrimSpace(string(output)), "\n")
+		for line := range lines {
+			trimmed := strings.TrimSpace(line)
+			if trimmed != "" {
+				// First non-empty line is the first remote
+				return trimmed, nil
+			}
+		}
+		return "", fmt.Errorf("no remotes found")
+	},
 }

 var cvsDummyBackend = &VCSBackend{
@ -372,6 +490,19 @@ var FossilBackend = &VCSBackend{
 		return cmdutil.RunInDir(dir, "fossil", "open", fossilRepoName)
 	},
 	Contents: []string{".fslckout", "_FOSSIL_"},
+	RemoteURL: func(dir string) (string, error) {
+		cmd := exec.Command("fossil", "remote-url")
+		cmd.Dir = dir
+		output, err := cmd.Output()
+		if err != nil {
+			return "", fmt.Errorf("failed to get remote URL: %w", err)
+		}
+		url := strings.TrimSpace(string(output))
+		if url == "" || url == "off" {
+			return "", fmt.Errorf("no remote URL configured")
+		}
+		return url, nil
+	},
 }

 // BazaarBackend is the VCSBackend for bazaar
@ -396,6 +527,19 @@ var BazaarBackend = &VCSBackend{
 		return cmdutil.RunInDir(dir, "bzr", "init")
 	},
 	Contents: []string{".bzr"},
+	RemoteURL: func(dir string) (string, error) {
+		cmd := exec.Command("bzr", "config", "parent_location")
+		cmd.Dir = dir
+		output, err := cmd.Output()
+		if err != nil {
+			return "", fmt.Errorf("failed to get parent location: %w", err)
+		}
+		url := strings.TrimSpace(string(output))
+		if url == "" {
+			return "", fmt.Errorf("parent location is empty")
+		}
+		return url, nil
+	},
 }

 var vcsRegistry = map[string]*VCSBackend{
--- a/worktree.go
+++ b/worktree.go
@ -0,0 +1,202 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"syscall"
+)
+
+// isNotADirectory returns true if err indicates a "not a directory" condition
+// (e.g., trying to traverse a path component that is a regular file).
+func isNotADirectory(err error) bool {
+	return errors.Is(err, syscall.ENOTDIR)
+}
+
+// isLinkedGitDir checks whether dir has a .git file (not directory) with a
+// gitdir: reference. This is the case for both linked worktrees and
+// submodules — either way, the directory cannot be migrated independently.
+// When true, it returns the resolved gitdir target path.
+func isLinkedGitDir(dir string) (bool, string, error) {
+	dotGit := filepath.Join(dir, ".git")
+	fi, err := os.Lstat(dotGit)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return false, "", nil
+		}
+		return false, "", err
+	}
+
+	// .git is a directory → regular repo, safe to migrate
+	if fi.IsDir() {
+		return false, "", nil
+	}
+
+	// .git is a file → linked checkout (worktree or submodule)
+	content, err := os.ReadFile(dotGit)
+	if err != nil {
+		return false, "", err
+	}
+
+	line := strings.TrimSpace(string(content))
+	if !strings.HasPrefix(line, "gitdir: ") {
+		return false, "", nil
+	}
+
+	gitdir := strings.TrimPrefix(line, "gitdir: ")
+
+	// Resolve relative paths
+	if !filepath.IsAbs(gitdir) {
+		gitdir = filepath.Join(dir, gitdir)
+	}
+	gitdir = filepath.Clean(gitdir)
+
+	return true, gitdir, nil
+}
+
+// isWorktreeGitDir returns true if gitdirTarget looks like a worktree entry
+// (.git/worktrees/<name>) rather than a submodule (.git/modules/<name>).
+func isWorktreeGitDir(gitdirTarget string) bool {
+	return strings.Contains(filepath.ToSlash(gitdirTarget), ".git/worktrees/")
+}
+
+// hasLinkedWorktrees reports whether the Git repository at dir has any linked
+// worktrees (entries under .git/worktrees/).
+//
+// Known limitation: bare repos store worktrees in <bare-repo>/worktrees/
+// (no .git/ prefix). This check only looks at .git/worktrees/ and would
+// miss bare repo worktrees.
+func hasLinkedWorktrees(dir string) (bool, error) {
+	worktreesDir := filepath.Join(dir, ".git", "worktrees")
+	entries, err := os.ReadDir(worktreesDir)
+	if err != nil {
+		if os.IsNotExist(err) || isNotADirectory(err) {
+			return false, nil
+		}
+		return false, err
+	}
+	for _, e := range entries {
+		if e.IsDir() {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
+// listLinkedWorktreePaths reads .git/worktrees/*/gitdir in dir and returns
+// the worktree working-directory paths.
+func listLinkedWorktreePaths(dir string) ([]string, error) {
+	worktreesDir := filepath.Join(dir, ".git", "worktrees")
+	entries, err := os.ReadDir(worktreesDir)
+	if err != nil {
+		if os.IsNotExist(err) || isNotADirectory(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	var paths []string
+	for _, e := range entries {
+		if !e.IsDir() {
+			continue
+		}
+		gitdirFile := filepath.Join(worktreesDir, e.Name(), "gitdir")
+		content, err := os.ReadFile(gitdirFile)
+		if err != nil {
+			continue
+		}
+		wtPath := strings.TrimSpace(string(content))
+		if wtPath == "" {
+			continue
+		}
+
+		// Resolve to native path
+		wtPath = filepath.FromSlash(wtPath)
+		if !filepath.IsAbs(wtPath) {
+			wtPath = filepath.Join(worktreesDir, e.Name(), wtPath)
+		}
+		wtPath = filepath.Clean(wtPath)
+
+		// The gitdir file stores the path to the worktree's .git file
+		// (e.g., "/path/to/wt/.git"); strip trailing /.git to get working dir.
+		wtDir := strings.TrimSuffix(filepath.ToSlash(wtPath), "/.git")
+		paths = append(paths, filepath.FromSlash(wtDir))
+	}
+	return paths, nil
+}
+
+// resolveMainRepoDir resolves the main repository working directory from a
+// worktree's gitdir target path (e.g., /path/to/main/.git/worktrees/<name>).
+// It reads the commondir file to find the shared .git directory.
+func resolveMainRepoDir(gitdirTarget string) (string, error) {
+	commondirFile := filepath.Join(gitdirTarget, "commondir")
+	content, err := os.ReadFile(commondirFile)
+	if err != nil {
+		return "", fmt.Errorf("failed to read commondir: %w", err)
+	}
+	commondir := strings.TrimSpace(string(content))
+	if !filepath.IsAbs(commondir) {
+		commondir = filepath.Join(gitdirTarget, commondir)
+	}
+	commondir = filepath.Clean(commondir)
+	// commondir points to the .git directory; the working tree is its parent
+	return filepath.Dir(commondir), nil
+}
+
+// repairWorktreeBackPointers reads .git/worktrees/*/gitdir in destDir and
+// returns the current worktree working-directory paths. For worktrees that
+// were inside the old repo directory (oldDir), it rewrites the gitdir file
+// to reflect the new location so that a subsequent "git worktree repair"
+// can match them.
+func repairWorktreeBackPointers(oldDir, destDir string) ([]string, error) {
+	worktreesDir := filepath.Join(destDir, ".git", "worktrees")
+	entries, err := os.ReadDir(worktreesDir)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	// Normalize paths to forward slashes for comparison, since Git uses forward slashes
+	// in gitdir files even on Windows
+	oldPrefixNorm := filepath.ToSlash(oldDir) + "/"
+	var paths []string
+	for _, e := range entries {
+		if !e.IsDir() {
+			continue
+		}
+		gitdirFile := filepath.Join(worktreesDir, e.Name(), "gitdir")
+		content, err := os.ReadFile(gitdirFile)
+		if err != nil {
+			continue // skip entries without a gitdir file
+		}
+		wtPath := strings.TrimSpace(string(content))
+		if wtPath == "" {
+			continue
+		}
+
+		// Internal worktree: moved along with the repo → fix back-pointer
+		// Normalize wtPath for comparison since Git writes forward slashes on all platforms
+		wtPathNorm := filepath.ToSlash(wtPath)
+		if strings.HasPrefix(wtPathNorm, oldPrefixNorm) {
+			// Compute new path: take the relative portion and join with destDir
+			relativePart := wtPathNorm[len(oldPrefixNorm):]
+			newPath := filepath.ToSlash(filepath.Join(destDir, relativePart))
+			if err := os.WriteFile(gitdirFile, []byte(newPath+"\n"), 0644); err != nil {
+				return nil, fmt.Errorf("failed to rewrite gitdir for worktree %s: %w", e.Name(), err)
+			}
+			wtPath = newPath
+		}
+
+		// The gitdir file stores the path to the worktree's .git file
+		// (e.g., "/path/to/wt/.git"), but git worktree repair expects
+		// the worktree working directory (e.g., "/path/to/wt").
+		// Since wtPath is normalized to forward slashes, trim "/.git"
+		wtDir := strings.TrimSuffix(wtPath, "/.git")
+		paths = append(paths, wtDir)
+	}
+	return paths, nil
+}