diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-10-13 01:52:43 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-10-13 02:07:39 +0200 |
| commit | 626264a12dad24a20801f3fca2d996c3599b9429 (patch) | |
| tree | b6fc0082afa383ae0e20605d03e6db8133f28fb0 /org.eclipse.jgit.pgm/resources | |
| parent | 82e277c813398c9f519f16e83d080a94fa29a27c (diff) | |
| parent | da60ac9aa6029e0a9ca71ed92942d463888492e6 (diff) | |
| download | jgit-626264a12dad24a20801f3fca2d996c3599b9429.tar.gz jgit-626264a12dad24a20801f3fca2d996c3599b9429.zip | |
Merge branch 'stable-6.4' into stable-6.5
* stable-6.4:
PackConfig: fix @since tags
Remove unused API problem filters
Add support for git config repack.packKeptObjects
Do not exclude objects in locked packs from bitmap processing
Change-Id: I2951d01f5f4581bee20079508cd8ee6ca8554f1f
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 98d711d0ff..15fe09639b 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -298,6 +298,7 @@ usage_MakeCacheTree=Show the current cache tree structure usage_Match=Only consider tags matching the given glob(7) pattern or patterns, excluding the "refs/tags/" prefix. usage_MergeBase=Find as good common ancestors as possible for a merge usage_MergesTwoDevelopmentHistories=Merges two development histories +usage_PackKeptObjects=Include objects in packs locked by a ".keep" file when repacking usage_PreserveOldPacks=Preserve old pack files by moving them into the preserved subdirectory instead of deleting them after repacking usage_PrunePreserved=Remove the preserved subdirectory containing previously preserved old pack files before repacking, and before preserving more old pack files usage_ReadDirCache= Read the DirCache 100 times |