diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 12:08:46 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 12:08:46 +0200 |
| commit | d5ff94d57533c885ab1e2c41123229d09dbe1834 (patch) | |
| tree | e848ac344cb3b90dbd84c8f9ec209de6ac39057c /org.eclipse.jgit/resources | |
| parent | 4ac790fda856296128f475558493c2db4c6d6bda (diff) | |
| parent | 1887c834772d9e035b50ebda4922aa5c8159a31f (diff) | |
| download | jgit-d5ff94d57533c885ab1e2c41123229d09dbe1834.tar.gz jgit-d5ff94d57533c885ab1e2c41123229d09dbe1834.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
Retry stale file handles on .git/config file
Change-Id: Ib665c094b28eefb8236752bb273de0c2d9bf9578
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 627007dc04..a9153ca345 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -126,6 +126,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 |