From 7dd2a67c418b90cf71ad9223a06038bf03f7886c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 May 2024 15:33:47 -0400 Subject: [PATCH] fix names of new git configs --- doc/git-annex.mdwn | 4 ++-- doc/git-remote-annex.mdwn | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 2053269cf2..bb0a6172cf 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -1648,7 +1648,7 @@ Remotes are configured using these settings in `.git/config`. remotes, and is set when using [[git-annex-initremote]](1) with the `--private` option. -* `remote..max-git-bundles`, `annex.max-git-bundles` +* `remote..annex-max-git-bundles`, `annex.max-git-bundles` When using [[git-remote-annex]] to store a git repository in a special remote, this configures how many separate git bundle objects to store @@ -1659,7 +1659,7 @@ Remotes are configured using these settings in `.git/config`. while preventing a new clone needing to download too many objects. Set to 0 to disable re-uploading. -* `remote..allow-encrypted-gitrepo` +* `remote..annex-allow-encrypted-gitrepo` Setting this to true allows using [[git-remote-annex]] to push the git repository to an encrypted special remote. diff --git a/doc/git-remote-annex.mdwn b/doc/git-remote-annex.mdwn index 912b9702b5..52d9a11ccb 100644 --- a/doc/git-remote-annex.mdwn +++ b/doc/git-remote-annex.mdwn @@ -46,7 +46,7 @@ Pushes to a special remote are usually done incrementally. However, sometimes the whole git repository (but not the annex) needs to be re-uploaded. That is done when deleting a ref from the remote. It's also done when too many git bundles accumulate in the special remote, as -configured by the `remote..max-git-bundles` git config. +configured by the `remote..annex-max-git-bundles` git config. Like any git repository, a git repository stored on a special remote can have conflicting things pushed to it from different places. This mostly