diff --git a/CHANGELOG b/CHANGELOG index d9675a47de..a2036e20fd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,25 +1,25 @@ -git-annex (10.20250521) UNRELEASED; urgency=medium +git-annex (10.20250605) upstream; urgency=medium - * assistant: Avoid hanging at startup when a process has a *.lock file - open in the .git directory. - * When annex.freezecontent-command or annex.thawcontent-command is - configured but fails, prevent initialization. This allows the user to - fix their configuration and avoid crippled filesystem detection - entering an adjusted branch. - * map: Support --json option. - * map: Improve display of remote names. - * Windows: Fix duplicate file bug that could occur when files were - supposed to be moved across devices. - * Added annex.fastcopy and remote.name.annex-fastcopy config setting. - When set, this allows the copy_file_range syscall to be used, which - can eg allow for server-side copies on NFS. (For fastest copying, - also disable annex.verify or remote.name.annex-verify.) * sync: Push the current branch first, rather than a synced branch, to better support git forges (gitlab, gitea, forgejo, etc.) which use push-to-create with the first pushed branch becoming the default branch. + * Added annex.fastcopy and remote.name.annex-fastcopy config setting. + When set, this allows the copy_file_range syscall to be used, which + can eg allow for server-side copies on NFS. (For fastest copying, + also disable annex.verify or remote.name.annex-verify.) + * map: Support --json option. + * map: Improve display of remote names. + * When annex.freezecontent-command or annex.thawcontent-command is + configured but fails, prevent initialization. This allows the user to + fix their configuration and avoid crippled filesystem detection + entering an adjusted branch. + * assistant: Avoid hanging at startup when a process has a *.lock file + open in the .git directory. + * Windows: Fix duplicate file bug that could occur when files were + supposed to be moved across devices. - -- Joey Hess Thu, 22 May 2025 12:43:38 -0400 + -- Joey Hess Thu, 05 Jun 2025 14:10:36 -0400 git-annex (10.20250520) upstream; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index a5eb40c4ee..8c5933d898 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 10.20250520 +Version: 10.20250605 Cabal-Version: 1.12 License: AGPL-3 Maintainer: Joey Hess