diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 12:30:05 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 12:30:05 +0200 |
| commit | dd9a14a762c796080f95f638c5c77b26c3e5fe11 (patch) | |
| tree | 636641138457f0d197c12630f072d347b2b33b0d /org.eclipse.jgit/resources | |
| parent | 185e53bce447f75c09c1102c5e803a88009bcd74 (diff) | |
| parent | d5ff94d57533c885ab1e2c41123229d09dbe1834 (diff) | |
| download | jgit-dd9a14a762c796080f95f638c5c77b26c3e5fe11.tar.gz jgit-dd9a14a762c796080f95f638c5c77b26c3e5fe11.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
Retry stale file handles on .git/config file
Change-Id: Ib029b5536c038190626e7a7ff43b70f0a5673721
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 865f962052..8bae60b0e3 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -128,6 +128,7 @@ commitMessageNotSpecified=commit message not specified commitOnRepoWithoutHEADCurrentlyNotSupported=Commit on repo without HEAD currently not supported commitAmendOnInitialNotPossible=Amending is not possible on initial commit. compressingObjects=Compressing objects +configHandleIsStale=config file handle is stale, {0}. retry connectionFailed=connection failed connectionTimeOut=Connection time out: {0} contextMustBeNonNegative=context must be >= 0 |