diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-10-13 01:33:56 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-10-13 01:33:56 +0200 |
| commit | da60ac9aa6029e0a9ca71ed92942d463888492e6 (patch) | |
| tree | 3ae42be8f7c5f8a44a2b35f6aa6a9f831d3d3046 /org.eclipse.jgit.pgm/resources | |
| parent | 76dfbb2ccd798e55c051c6c4cc9c305715c8a0fa (diff) | |
| parent | c59bf1629175ccc126813cf51ef92be4e28b5ba8 (diff) | |
| download | jgit-da60ac9aa6029e0a9ca71ed92942d463888492e6.tar.gz jgit-da60ac9aa6029e0a9ca71ed92942d463888492e6.zip | |
Merge branch 'stable-6.3' into stable-6.4
* stable-6.3:
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: I4b94a2b79941c085fa2f62246e8e879aaa85cd3f
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 48f4e857a2..e0db759985 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 @@ -294,6 +294,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 |