diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-07 11:07:21 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-07 12:16:42 +0200 |
| commit | 38198972d4b3ac26828867317a7daa8bdfb10f4b (patch) | |
| tree | 33eb494b509adc6b8f6a4cae8fe8fea9c9f825d8 /org.eclipse.jgit.pgm/resources | |
| parent | aa62f191d02c19073c22a5e33e4a07c54a67efa7 (diff) | |
| parent | e626c55936a6e5a969bb720c26db9e4434c46edc (diff) | |
| download | jgit-38198972d4b3ac26828867317a7daa8bdfb10f4b.tar.gz jgit-38198972d4b3ac26828867317a7daa8bdfb10f4b.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Bazel: Fix warning about deprecated lib.bzl
Format lib/BUILD with buildifier
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Bump minimum supported version to 0.29.0
Bazel: Bump skylib library version to 0.8.0
Use bazelisk to switch between used bazel version
Bazel: Require minimum bazel version 0.17.1
Fix wrong placeholder index in error message packInaccessible
JGitText: Remove unused externalized strings
RepoText: Remove unused externalized string
CLI: Remove unused externalized strings
Change-Id: Iea37a8e39e9d4872dc607c9222dcf191ce4e4757
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties | 4 |
1 files changed, 0 insertions, 4 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 d7d895ab31..bbf9366ce7 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 @@ -24,7 +24,6 @@ branchNameRequired=branch name required branchNotFound=branch ''{0}'' not found. cacheTreePathInfo="{0}": {1} entries, {2} children cannotBeRenamed={0} cannot be renamed -cannotChekoutNoHeadsAdvertisedByRemote=cannot checkout; no HEAD advertised by remote cannotCombineSquashWithNoff=You cannot combine --squash with --no-ff. cannotCreateCommand=Cannot create command {0} cannotCreateOutputStream=cannot create output stream @@ -33,7 +32,6 @@ cannotDeleteFile=error: The following file could not be deleted: cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch ''{0}'' which you are currently on. cannotGuessLocalNameFrom=cannot guess local name from {0} cannotLock=Cannot lock {0} -cannotMergeDetachedHead=Cannot merge into detached HEAD cannotReadBecause=cannot read {0}: {1} cannotReadPackageInformation=Cannot read package information. cannotRenameDetachedHEAD=Cannot rename detached HEAD @@ -64,7 +62,6 @@ expectedNumberOfbytes=Expected {0} bytes. exporting=Exporting {0} failedToCommitIndex=failed to commit index failedToLockIndex=failed to lock index -failedToLockTag=Failed to lock tag {0}: {1} fatalError=fatal: {0} fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal: {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal: fetchingSubmodule=Fetching submodule {0} @@ -154,7 +151,6 @@ needSingleRevision=Needed a single revision noGitRepositoryConfigured=No Git repository configured. noNamesFound=No names found, cannot describe anything. noSuchFile=no such file: {0} -noSuchRemoteRef=no such remote ref: ''{0}'' noSystemConsoleAvailable=No System.console available noTREESectionInIndex=no 'TREE' section in index nonFastForward=non-fast forward |