diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:43:16 +0000 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:43:16 +0000 |
| commit | 3e73672c06c3c369449c1463a869d31004957fcc (patch) | |
| tree | 575c214b0d0cbcd6adf2b5cf5781c8dcdb1c03d4 | |
| parent | 23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd (diff) | |
| parent | 735f79c663f9ab4f5422a32a31512cc919f744f0 (diff) | |
| download | jgit-3e73672c06c3c369449c1463a869d31004957fcc.tar.gz jgit-3e73672c06c3c369449c1463a869d31004957fcc.zip | |
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: If82e40c5a39b84c6a63e8cc10d168696c4eb3e91
Signed-off-by: Jonathan Nieder <jrn@google.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java index 59e2834cb8..d37fb21c93 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java @@ -1240,11 +1240,11 @@ public class ObjectChecker { } /** - * Get the list of".gitmodules" files found in the pack. For each, report + * Get the list of ".gitmodules" files found in the pack. For each, report * its blob id (e.g. to validate its contents) and the tree where it was * found (e.g. to check if it is in the root) * - * @return List of pairs of ids <tree, blob> + * @return List of pairs of ids {@literal <tree, blob>}. * * @since 4.7.5 */ |