diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:40:23 +0000 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-10-07 03:40:23 +0000 |
| commit | 735f79c663f9ab4f5422a32a31512cc919f744f0 (patch) | |
| tree | 96bda29a1ede1691adc4cbd66069adae99fd5d3c | |
| parent | 620370ab6ad850862d0cfa1816c1fff0cbce3662 (diff) | |
| parent | 112a19711d8526bfd4f4ef6d8e64e2a6f9601e42 (diff) | |
| download | jgit-735f79c663f9ab4f5422a32a31512cc919f744f0.tar.gz jgit-735f79c663f9ab4f5422a32a31512cc919f744f0.zip | |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: Id2c8d1d4ffdf7bf18ef64479cfa1e959d9b2c37e
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 2207b1b11f..5c14754000 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 */ |