diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:46:37 +0000 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:46:37 +0000 |
| commit | 7647b03e94b515187c0d84d228c9f1c85651d415 (patch) | |
| tree | 73df9b58e4844220550be2d93715b6ca56d0101b | |
| parent | 1133faff8ca980b688e79a3fcadd1641ff6b3bcd (diff) | |
| parent | c1ef0d2cfdb831da900f74095f55ff88a2d8ee52 (diff) | |
| download | jgit-7647b03e94b515187c0d84d228c9f1c85651d415.tar.gz jgit-7647b03e94b515187c0d84d228c9f1c85651d415.zip | |
Merge branch 'stable-5.1'
* stable-5.1:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: I20f19666c2faccc68bfd5ea15582b534784a027a
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 */ |