diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2017-12-13 09:51:44 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2017-12-13 09:51:57 +0900 |
| commit | c09ed93e85165e4a77f9a3b51fbd5e09555b3e7c (patch) | |
| tree | 0b5f776ffee0a65c9e61c3c8ec724734f82fdd91 | |
| parent | c9b4903ae30c072861c28acbf5dc5d29c1497b89 (diff) | |
| parent | 623851ec16ab3dc590dd2fb6a6197285dee9c6f7 (diff) | |
| download | jgit-c09ed93e85165e4a77f9a3b51fbd5e09555b3e7c.tar.gz jgit-c09ed93e85165e4a77f9a3b51fbd5e09555b3e7c.zip | |
Merge branch 'stable-4.9'
* stable-4.9:
TransportCommand#setTimeout: Specify units for timeout in Javadoc
Fix typo in key of a JGitText externalized string
Change-Id: Icb60537d2e99cb6e928d9fe07f66695ed69081b5
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/TransportCommand.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/TransportCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/TransportCommand.java index 3d2e46b26e..1541df5d39 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/TransportCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/TransportCommand.java @@ -95,7 +95,7 @@ public abstract class TransportCommand<C extends GitCommand, T> extends /** * @param timeout - * the timeout used for the transport step + * the timeout (in seconds) used for the transport step * @return {@code this} */ public C setTimeout(int timeout) { |