git-nested 1.2.1__tar.gz → 1.2.2__tar.gz

{git_nested-1.2.1 → git_nested-1.2.2}/.github/workflows/docs.yml

@@ -27,7 +27,7 @@ jobs:
           # doc/conf.py shows the version from `git describe`, which needs the tags.
           fetch-depth: 0
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.3.0
+        uses: astral-sh/setup-uv@v10.3.3
         with:
           python-version: '3.14'
           enable-cache: true

{git_nested-1.2.1 → git_nested-1.2.2}/.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.3.0
+        uses: astral-sh/setup-uv@v10.3.3
         with:
           python-version: '3.13'
           enable-cache: true

{git_nested-1.2.1 → git_nested-1.2.2}/.github/workflows/test-binary.yml

@@ -38,7 +38,7 @@ jobs:
           # tags of this checkout.
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.3.0
+        uses: astral-sh/setup-uv@v10.3.3
         with:
           python-version: '3.13'
           enable-cache: true

{git_nested-1.2.1 → git_nested-1.2.2}/.github/workflows/test.yml

@@ -5,6 +5,15 @@ on:
     branches: [main]
   pull_request:
     branches: ['**']
+  # daily on main (scheduled runs always use the default branch), so a
+  # breaking change in a dependency, runner image or upstream download shows
+  # up even on a day without any commit
+  schedule:
+    - cron: '0 18 * * *'
+      timezone: Europe/Berlin
+  # by hand for any branch: 'Run workflow' in the Actions tab, or
+  # `gh workflow run test.yml --ref <branch>`
+  workflow_dispatch:
 
 # One run per branch/PR at a time. On a PR a newer push cancels the run in
 # progress: only the newest commit's results matter there, and waiting for a
@@ -68,7 +77,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-26.04, macos-latest, windows-latest]
-        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
+        # A PR runs only the oldest and newest Python. main runs all of them.
+        python-version: ${{ fromJSON(github.event_name == 'pull_request' && '["3.10", "3.14"]' || '["3.10", "3.11", "3.12", "3.13", "3.14"]') }}
 
     steps:
       - name: Checkout code
@@ -78,8 +88,29 @@ jobs:
           # authorship) needs real history, not the default shallow, tagless
           # checkout.
           fetch-depth: 0
+      # The tests start many git processes and write many small files.
+      # On Windows, Defender scans each one, which makes the tests slow.
+      - name: Turn off Defender scanning
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: Set-MpPreference -DisableRealtimeMonitoring $true
+      # A Dev Drive is a fast ReFS drive. TEMP points there, so the test
+      # repos in tmp_path live on it.
+      - name: Set up Dev Drive
+        if: runner.os == 'Windows'
+        uses: samypr100/setup-dev-drive@v4.1.0
+        with:
+          drive-size: 8GB
+          drive-path: ${{ runner.temp }}/dev_drive.vhdx
+          trusted-dev-drive: true
+          env-mapping: |
+            TEMP,{{ DEV_DRIVE }}/tmp
+            TMP,{{ DEV_DRIVE }}/tmp
+      - name: Create temp dir on Dev Drive
+        if: runner.os == 'Windows'
+        run: mkdir -p "$TEMP" && echo "TEMP=$TEMP"
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.3.0
+        uses: astral-sh/setup-uv@v10.3.3
         with:
           python-version: ${{ matrix.python-version }}
           enable-cache: true

{git_nested-1.2.1/src/git_nested.egg-info → git_nested-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-nested
-Version: 1.2.1
+Version: 1.2.2
 Summary: Git Submodule Alternative
 Author-email: Thorsten Klein <thorsten.klein.git@gmail.com>
 License: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://github.com/thorsten-klein/git-nested
 Project-URL: Documentation, https://thorsten-klein.github.io/git-nested/
 Project-URL: Repository, https://github.com/thorsten-klein/git-nested
 Project-URL: Issues, https://github.com/thorsten-klein/git-nested/issues
-Keywords: git,nested,submodule,nested
+Keywords: cli,dependency-management,developer-tools,git,git-extension,git-submodule,git-submodules,git-subrepo,git-subtree,git-tools,monorepo,multi-repo,nested-repositories,python,repository-management,submodules,subrepo,subtree,vendoring,version-control
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Version Control :: Git
@@ -56,6 +56,15 @@ git nested status                                      # see where everything st
 A small `.gitnested` file in the folder remembers the URL, the branch and
 the upstream commit. So the commands stay short.
 
+Your repository has submodules already? Turn them all into nested
+repositories, and keep following upstream:
+
+```bash
+git nested submodules init --recursive
+git fetch origin
+git nested submodules update origin/main
+```
+
 ## Why git-nested?
 
 - **Self-contained.** Your repository has all files. A plain `git clone`

{git_nested-1.2.1 → git_nested-1.2.2}/README.md

@@ -30,6 +30,15 @@ git nested status                                      # see where everything st
 A small `.gitnested` file in the folder remembers the URL, the branch and
 the upstream commit. So the commands stay short.
 
+Your repository has submodules already? Turn them all into nested
+repositories, and keep following upstream:
+
+```bash
+git nested submodules init --recursive
+git fetch origin
+git nested submodules update origin/main
+```
+
 ## Why git-nested?
 
 - **Self-contained.** Your repository has all files. A plain `git clone`

{git_nested-1.2.1 → git_nested-1.2.2}/doc/architecture/diagrams.md

@@ -69,6 +69,12 @@ sequenceDiagram
             git-nested->>Git: ls-files -- <subdir>
             git-nested->>Git: read-tree --prefix=<subdir> -u <nested_commit_ref>
             Note over git-nested: Write .gitnested
+            opt patches in use
+                git-nested->>Git: checkout HEAD -- <inner repos added here>
+                git-nested->>Git: rm -r -f / checkout HEAD -- <patches-ignore paths>
+                git-nested->>Git: format-patch --zero-commit --no-signature -o <folder> <upstream>..<nested_commit_ref> -- <without local paths>
+                git-nested->>Git: add -A -f -- <folder>
+            end
             git-nested->>Git: rev-parse <nested_commit_ref>
             git-nested->>Git: add -f -- <subdir>/.gitnested
             git-nested->>Git: diff --cached --quiet
@@ -207,6 +213,13 @@ sequenceDiagram
     git-nested->>Git: diff-index --quiet --cached --ignore-submodules HEAD
     git-nested->>Git: rev-parse HEAD
 
+    opt patches in use (HEAD has a patch)
+        Note over git-nested: Stop if subdir has changes the patches do not hold
+        git-nested->>Git: worktree add --detach .git/tmp/patches/<subref> <recorded commit>
+        git-nested->>Git: am -3 --keep-cr <patch>... (in the worktree)
+        git-nested->>Git: diff --quiet HEAD <local tree> -- <without the patches folder, inner repos, patches-ignore>
+    end
+
     rect rgb(230, 245, 255)
         Note over git-nested,Git: do_fetch
         git-nested->>Git: fetch --no-tags --quiet <remote> <branch>
@@ -229,6 +242,12 @@ sequenceDiagram
             git-nested->>Git: branch -D nested/<subref>
         end
 
+        opt patches in use: instead of create_nested_branch and the merge or rebase
+            git-nested->>Git: worktree add --no-checkout -b nested/<subref> <worktree> refs/nested/<subref>/fetch
+            git-nested->>Git: am -3 --keep-cr <all patches> (in the worktree)
+            Note over git-nested: On a conflict: stop and name the patch. git am --continue goes on with the rest
+        end
+
         rect rgb(230, 245, 255)
             Note over git-nested,Git: create_nested_branch
             git-nested->>Git: rev-list refs/heads/nested/<subref> -1
@@ -265,6 +284,16 @@ sequenceDiagram
             git-nested->>Git: update-ref refs/nested/<subref>/branch nested/<subref>
         end
 
+        opt --ignore
+            Note over git-nested: Upstream, with the ignored paths from the recorded commit
+            git-nested->>Git: read-tree <upstream> (temporary index)
+            git-nested->>Git: rm --cached -r -q -f --ignore-unmatch -- <ignored>
+            git-nested->>Git: ls-tree -r -z --full-tree <recorded commit> -- <ignored>
+            git-nested->>Git: update-index -z --index-info
+            git-nested->>Git: commit-tree -p <upstream> <tree>
+            Note over git-nested: The merge and rebase below use this commit
+        end
+
         alt method = merge
             git-nested->>Git: merge --ff --no-edit refs/nested/<subref>/fetch
             Note over git-nested: (in worktree)
@@ -283,6 +312,12 @@ sequenceDiagram
                 git-nested->>Git: rm -r -- <subdir>
                 git-nested->>Git: read-tree --prefix=<subdir> -u <nested_commit_ref>
                 Note over git-nested: Write .gitnested
+                opt patches in use
+                    git-nested->>Git: checkout HEAD -- <inner repos added here>
+                    git-nested->>Git: rm -r -f / checkout HEAD -- <patches-ignore paths>
+                    git-nested->>Git: format-patch --zero-commit --no-signature -o <folder> <upstream>..<nested_commit_ref> -- <without local paths>
+                    git-nested->>Git: add -A -f -- <folder>
+                end
                 git-nested->>Git: add -f -- <subdir>/.gitnested
                 git-nested->>Git: diff --cached --quiet
                 git-nested->>Git: commit --no-verify [--signoff] [-S] -m <message>
@@ -314,8 +349,11 @@ sequenceDiagram
         end
     end
 
-    opt Submodules of upstream that were nested, or --recurse-submodules
-        Note over git-nested: Nest each at the commit upstream pins now (as in clone)
+    opt Submodules of upstream that are nested
+        Note over git-nested: Put them back from HEAD, with your changes.<br/>Then pull each to the commit upstream pins now
+    end
+    opt --recurse-submodules
+        Note over git-nested: Nest each new one at the commit upstream pins (as in clone)
     end
 
     Note over git-nested: The commit message lists the new upstream commits
@@ -379,6 +417,8 @@ sequenceDiagram
         Note over git-nested: (Same branch creation as in pull — see pull diagram)
         git-nested->>Git: ls-tree -r -z --name-only HEAD -- <subdir>
         Note over git-nested: Also drop .gitnested.levelN files and inner nested repos upstream does not have
+        Note over git-nested: With --ignore: the ignored paths come from upstream
+        Note over git-nested: The patches folder is dropped. patches-ignore paths come from upstream
         git-nested->>Git: branch nested/<subref> <tip>
         git-nested->>Git: worktree add --no-checkout <worktree_path> nested/<subref>
         git-nested->>Git: reset -q --hard (in the worktree)
@@ -418,6 +458,8 @@ sequenceDiagram
     opt --commit flag
         Note over git-nested: Update .gitnested
         git-nested->>Git: add -f -- <subdir>/.gitnested
+        Note over git-nested: Empty the patches folder: upstream has the changes now
+        git-nested->>Git: add -A -f -- <folder>
         git-nested->>Git: commit --no-verify [--signoff] [-S] -m <message>
         Note over git-nested: If it fails: reset -q --hard HEAD
     end
@@ -652,7 +694,14 @@ sequenceDiagram
         git-nested->>Git: ls-files -- <subdir>
         git-nested->>Git: rm -r -- <subdir>
         git-nested->>Git: read-tree --prefix=<subdir> -u <nested_commit_ref>
+        Note over git-nested: Inner nested repos: checkout HEAD -- <path>, not the gitlink
         Note over git-nested: Write .gitnested
+        opt patches in use
+            git-nested->>Git: checkout HEAD -- <inner repos added here>
+            git-nested->>Git: rm -r -f / checkout HEAD -- <patches-ignore paths>
+            git-nested->>Git: format-patch --zero-commit --no-signature -o <folder> <upstream>..<nested_commit_ref> -- <without local paths>
+            git-nested->>Git: add -A -f -- <folder>
+        end
         git-nested->>Git: rev-parse <nested_commit_ref>
         git-nested->>Git: add -f -- <subdir>/.gitnested
         git-nested->>Git: diff --cached --quiet
@@ -663,6 +712,10 @@ sequenceDiagram
         Note over git-nested: Remove empty parent dirs up to .git/tmp
         git-nested->>Git: update-ref refs/nested/<subref>/commit <nested_commit_ref>
     end
+
+    opt Inner nested repos
+        Note over git-nested: Pull each to the commit upstream pins now (as in pull)
+    end
 ```
 
 ---
@@ -728,6 +781,53 @@ sequenceDiagram
 
 ---
 
+## submodules
+
+`init` runs `init --from-submodule` for each submodule. `update` looks
+like this:
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant git-nested
+    participant Git
+
+    User->>git-nested: git nested submodules update <commit>
+    git-nested->>Git: merge-base --is-ancestor <commit> HEAD
+    Note over git-nested: Merged already: only update the nested repos that lag behind
+    opt --dry-run
+        Note over git-nested: Print the plan, also deeper down, then stop
+    end
+    git-nested->>Git: merge --no-commit --no-ff <commit>
+    Note over git-nested: Write .git/nested-submodules-update.json for --continue and --abort
+    git-nested->>Git: update-index --force-remove <gitlink>
+    Note over git-nested: Drop each gitlink and its part of .gitmodules
+    Note over git-nested: Merge .gitattributes without git-nested's block, then add the block again
+    git-nested->>Git: commit --no-edit
+    Note over git-nested: Stop on other conflicts. --continue goes on here
+    opt A submodule pull stopped before
+        Note over git-nested: --continue finishes it there, then runs commit
+    end
+
+    loop For each submodule upstream changed
+        alt moved
+            git-nested->>Git: mv <old> <new>
+        else removed
+            git-nested->>Git: rm -r <path>
+        else added
+            Note over git-nested: Same as clone. Not for update = none
+        else new pin
+            Note over git-nested: Same as pull -b <pin> -u. Skipped if it has a pin
+        end
+        git-nested->>Git: commit
+    end
+
+    opt --single-commit
+        git-nested->>Git: reset --soft <merge commit>
+        git-nested->>Git: commit --amend
+    end
+```
+
 ## diff
 
 ```mermaid
@@ -770,6 +870,131 @@ sequenceDiagram
 
 ---
 
+## verify
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant git-nested
+    participant Git
+
+    User->>git-nested: git nested verify <subdir> [--patches <patch>...]
+    git-nested->>Git: rev-parse --show-prefix
+    Note over git-nested: Below the top level: rev-parse --show-toplevel,<br/>paths rebased, then run from there
+    git-nested->>Git: rev-parse --git-dir
+    git-nested->>Git: rev-parse --git-dir
+    git-nested->>Git: symbolic-ref --short --quiet HEAD
+    git-nested->>Git: rev-parse --is-inside-work-tree
+    git-nested->>Git: rev-parse HEAD
+    Note over git-nested: Read .gitnested config
+
+    git-nested->>Git: rev-parse HEAD:<subdir>
+    git-nested->>Git: rev-list <commit>^{commit} -1
+    opt upstream commit not here
+        git-nested->>Git: fetch --no-tags --quiet <remote> <branch>
+        git-nested->>Git: rev-parse FETCH_HEAD^0
+        git-nested->>Git: update-ref refs/nested/<subref>/fetch FETCH_HEAD^0
+    end
+    opt path, filter or exclude configured
+        Note over git-nested: Build a commit with only the nested part of upstream
+        git-nested->>Git: commit-tree -p <commit> <tree>
+    end
+
+    git-nested->>Git: worktree add --detach --no-checkout .git/tmp/verify/<subref> <base>
+    git-nested->>Git: reset -q --hard (in the worktree)
+    Note over git-nested: A file a checkout made CRLF is applied as an LF copy
+    alt patches
+        git-nested->>Git: -c core.hooksPath=<empty> am -3 --quiet --no-gpg-sign --keep-cr <patch>... (in the worktree)
+    else diffs
+        loop For each diff
+            git-nested->>Git: apply --index <file> (in the worktree)
+        end
+    end
+    git-nested->>Git: commit --allow-empty --no-verify (in the worktree)
+    git-nested->>Git: diff --quiet HEAD <local tree> -- . ':(exclude,glob)**/.gitnested*' [':(exclude,literal)<path>']
+    Note over git-nested: Left out: the patches folder, inner nested repos, patches-ignore and --ignore paths
+    Note over git-nested: The diffs below use the same paths
+
+    opt it differs
+        git-nested->>Git: diff --stat HEAD <local tree>
+        alt patches
+            git-nested->>Git: diff --binary --full-index --output=<file> HEAD <local tree>
+            git-nested->>Git: apply --index <file>
+            git-nested->>Git: commit -m 'TODO: title' -m 'TODO: description'
+            git-nested->>Git: format-patch --zero-commit --no-signature -1 --start-number=<n> -o <dir> HEAD
+        else diff with --output
+            git-nested->>Git: diff --binary --output=<file> <base> <local tree>
+        end
+    end
+
+    git-nested->>Git: worktree prune
+    Note over git-nested: The worktree is removed, unless --keep
+```
+
+---
+
+## patches
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant git-nested
+    participant Git
+
+    User->>git-nested: git nested patches create|verify|drop <subdir>
+    git-nested->>Git: rev-parse --show-prefix
+    Note over git-nested: Below the top level: rev-parse --show-toplevel,<br/>paths rebased, then run from there
+    git-nested->>Git: rev-parse --git-dir
+    git-nested->>Git: rev-parse --git-dir
+    git-nested->>Git: symbolic-ref --short --quiet HEAD
+    git-nested->>Git: rev-parse --is-inside-work-tree
+    git-nested->>Git: rev-parse HEAD
+    Note over git-nested: Read .gitnested config. Refuse if the patches are off or do not work with the setup
+
+    git-nested->>Git: rev-parse HEAD:<subdir>
+    git-nested->>Git: rev-list <commit>^{commit} -1
+    opt upstream commit not here
+        git-nested->>Git: fetch --no-tags --quiet <remote> <branch>
+        git-nested->>Git: rev-parse FETCH_HEAD^0
+        git-nested->>Git: update-ref refs/nested/<subref>/fetch FETCH_HEAD^0
+    end
+
+    git-nested->>Git: worktree add --detach --no-checkout .git/tmp/patches/<subref> <commit>
+    git-nested->>Git: reset -q --hard (in the worktree)
+    opt the folder has patches (not with create --force)
+        Note over git-nested: A patch file a checkout made CRLF is applied as an LF copy
+        git-nested->>Git: -c core.hooksPath=<empty> am -3 --quiet --no-gpg-sign --keep-cr <patch>... (in the worktree)
+    end
+    git-nested->>Git: diff --stat HEAD <local tree> -- . ':(exclude,glob)**/.gitnested*' [':(exclude,literal)<path>']
+    Note over git-nested: Left out: the patches folder, inner nested repos and patches-ignore paths
+
+    opt create, and HEAD has more
+        git-nested->>Git: diff --binary --full-index --output=<file> HEAD <local tree>
+        git-nested->>Git: apply --index <file>
+        git-nested->>Git: commit -m 'TODO: title' -m 'TODO: description'
+    end
+    git-nested->>Git: format-patch --zero-commit --no-signature --no-numbered --no-cover-letter -o <scratch> <commit>..HEAD
+    Note over git-nested: Compare with the folder, byte for byte
+    alt create
+        Note over git-nested: Replace the patches in the folder if they differ
+    else verify
+        Note over git-nested: Fail if a change is not in a patch, or a patch differs
+    end
+
+    git-nested->>Git: worktree prune
+
+    opt drop <patch>...
+        Note over git-nested: Refuse a dirty working tree, and changes the patches do not hold
+        git-nested->>Git: worktree add --detach --no-checkout <tmp> <commit>
+        git-nested->>Git: am -3 --keep-cr <the other patches> (in the worktree)
+        git-nested->>Git: read-tree --prefix=<subdir> -u <result>
+        git-nested->>Git: format-patch --zero-commit --no-signature -o <folder> <commit>..<result>
+        git-nested->>Git: commit --no-verify -m '<subdir>: drop the patch <name>'
+    end
+```
+
+---
+
 ## clean
 
 ```mermaid

{git_nested-1.2.1 → git_nested-1.2.2}/doc/architecture/index.md

@@ -64,6 +64,8 @@ One module per command, for example `commands/pull.py`. Each has one
 | `history.py` | rebuilds the nested history: the core algorithm |
 | `content.py` | creates the nested branch, places its content, commits |
 | `filters.py` | applies `filter` and `exclude` |
+| `patches.py` | keeps local changes as patch files: reads, applies and writes them |
+| `patchbuild.py` | builds and checks patches in a temporary worktree |
 | `gitfile.py` | reads and writes `.gitnested`, and the level files |
 | `refs.py` | names of the nested branches and refs |
 | `worktree.py` | temporary worktrees and their branches |

{git_nested-1.2.1 → git_nested-1.2.2}/doc/cli/branch.md

@@ -25,6 +25,13 @@ Use it to:
 - fix up the history before a push,
 - finish a pull by hand. See [Resolve conflicts](../guides/conflicts.md).
 
+With `--from-patches`, the branch is built from the patches instead of the
+history: the upstream commit from `.gitnested`, and one commit per patch on
+top. Each commit has the author, date and message of its patch. Then
+`branch` checks that the result is what HEAD has in `<subdir>`. It stops if
+a change is not in a patch yet, or if a patch is missing. Then
+[`patches create`](patches.md) writes the missing patch.
+
 Other changes in your working tree do not block it. If `<subdir>` has
 uncommitted changes, `branch` warns and ignores them.
 
@@ -43,6 +50,7 @@ uncommitted changes, `branch` warns and ignores them.
 | `-n`, `--name <name>` | name the branch. Default: `nested/<subdir>` |
 | `-F`, `--fetch` | fetch upstream first |
 | `-f`, `--force` | build the branch again if it exists |
+| `--from-patches` | build the branch from upstream and the patches. Stop if they do not give `<subdir>` |
 | `-S`, `--gpg-sign` | GPG-sign the rebuilt nested commits |
 
 ## Examples
@@ -52,6 +60,7 @@ git nested branch ext/lib
 git nested branch -d ../lib ext/lib
 git nested branch --name lib-fixes ext/lib
 git nested branch --all
+git nested branch --from-patches ext/lib
 ```
 
 Then work in the worktree:
@@ -87,6 +96,8 @@ A name from `--name` is stored in `.git/config`, as
   or use `--name`.
 - `--name` can not be the name of a branch git-nested does not own.
 - `--dir` and `--name` can not be used with `--all`.
+- `--from-patches` can not be used with `-S`: the patch commits are not
+  signed. It does not work with `filter`, `exclude` or `path` yet.
 
 ## See also
 

{git_nested-1.2.1 → git_nested-1.2.2}/doc/cli/clone.md

@@ -111,8 +111,16 @@ If nothing changed, it does nothing and says "already up to date".
 - `--adopt` can not be used with `--filter` or `--recurse-submodules`.
 - Without `--recurse-submodules`, submodules of upstream stay empty, and
   git-nested warns about it. See [Upstream submodules](../guides/submodules.md).
+- If your `.gitattributes` would change files of the nested repository,
+  for example `*.bat text eol=crlf`, `clone` and `pull` add `-text` for
+  these files to `.gitattributes`, in a commit of their own. So the files
+  stay as upstream has them, in git and in your checkout.
+- With `--recurse-submodules`, a submodule with `update = none` in
+  `.gitmodules` stays a submodule, as in git.
 - If upstream is empty, `clone` stops. Use [`init`](init.md) and then
   [`push`](push.md) to fill it.
+- With [patches](../guides/patches.md), `--force` starts over: it takes
+  upstream and empties the patches folder. The local changes are gone.
 
 ## See also
 

{git_nested-1.2.1 → git_nested-1.2.2}/doc/cli/commit.md

@@ -31,6 +31,7 @@ It needs a clean working tree, and a worktree of the nested branch.
 | `-f`, `--force` | commit even if the branch does not contain the fetched upstream commit |
 | `-m`, `--message <message>` | the commit message |
 | `--file <file>` | read the commit message from a file |
+| `--pin <commit>` | record this pin in `.gitnested`. The help of a conflicted `pull --pin` passes it |
 | `-S`, `--gpg-sign` | GPG-sign the commit |
 | `--signoff` | add a `Signed-off-by:` trailer to the commit |
 
@@ -47,6 +48,9 @@ git nested commit --file=msg.txt ext/lib
   it. Or pass `-F`.
 - The branch must contain the fetched upstream commit. Otherwise upstream
   changes would be lost. `--force` skips this check.
+- Nested repositories inside `<subdir>` stay nested, with your changes.
+  Then each one is pulled to the commit that upstream pins now, as `pull`
+  does.
 
 ## See also
 

{git_nested-1.2.1 → git_nested-1.2.2}/doc/cli/config.md

@@ -43,6 +43,10 @@ instead of editing the file by hand.
 | `pin` | a commit or tag of the branch to nest, instead of its newest commit | yes |
 | `cmdver` | the git-nested version that last wrote this file | no |
 | `readonly` | `true` makes push refuse, for a repository that is only pulled | yes |
+| `patches` | the folder with the local changes as patches, relative to the subdir | yes |
+| `patches-ignore` | paths in the subdir that stay local, so no patch needs their changes | no |
+| `patches-local` | patches a push leaves out, by file name | no |
+| `submodules` | `nest` or `keep`: whether a pull nests the submodules in it. Unset: nest | yes |
 
 The other keys are written by the commands themselves. Setting one by hand
 would describe a state the repository is not in.
@@ -65,5 +69,5 @@ git commit -m "lib: pull with rebase, never push"
 - A relative path as a `remote` value is taken relative to the folder you
   are in, like git does. It is stored relative to the top of your
   repository.
-- An unknown key, or a bad value for `method`, `squash` or `readonly`, is
-  refused.
+- An unknown key, or a bad value for `method`, `squash`, `readonly` or
+  `submodules`, is refused.

{git_nested-1.2.1 → git_nested-1.2.2}/doc/cli/index.md

@@ -16,7 +16,10 @@ Each command has its own page. This page lists what they share.
 | [`push`](push.md) | push a nested repository's local changes upstream |
 | [`fetch`](fetch.md) | fetch upstream content for a nested repository |
 | [`status`](status.md) | report on the nested repositories of this repository |
+| [`submodules`](submodules.md) | turn all submodules into nested repositories and keep them up to date |
 | [`diff`](diff.md) | show a nested repository's local changes against upstream |
+| [`patches`](patches.md) | write, check, drop or cherry-pick the patches of a nested repository |
+| [`verify`](verify.md) | check that a nested repository is its upstream commit plus patches or diffs |
 | [`branch`](branch.md) | create a branch holding the local nested commits |
 | [`run`](run.md) | run a git command in the worktree of a nested repository |
 | [`commit`](commit.md) | add a nested branch to the current history as one commit |
@@ -114,7 +117,8 @@ The details are on each command's page. In short:
 | `-f`, `--force` | force the operation; what it does differs per command |
 | `-S`, `--gpg-sign` | GPG-sign the commits git-nested makes |
 | `--signoff` | add a `Signed-off-by:` trailer |
-| `--single-commit` | with `--all`: one commit for all |
+| `--single-commit` | with `--all`: one commit for all. With `submodules`: one merge commit |
+| `--dry-run` | show what would happen; change nothing |
 
 ### `--all` and `-b`
 

{git_nested-1.2.1 → git_nested-1.2.2}/doc/cli/init.md

@@ -91,6 +91,7 @@ git nested init --from-submodule ext/lib
 This removes the submodule and clones the same URL at the same commit into
 its place. A relative submodule URL is resolved against the `origin` remote
 of your repository. See [Upstream submodules](../guides/submodules.md).
+To nest all submodules at once, use [`submodules init`](submodules.md).
 
 ## Notes