Browse Source

Fix typos in Javadoc

Change-Id: I225e04aefd02e56a62e16f3db53fdda77d5e7253
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
stable-5.5
Michael Keppler 6 years ago
parent
commit
3f41bd9d2f
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
  2. 4
      org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
  3. 4
      org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java

4
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java

@ -459,8 +459,8 @@ public class MergeCommand extends GitCommand<MergeResult> {
}
/**
* Use values from the configuation if they have not been explicitly defined
* via the setters
* Use values from the configuration if they have not been explicitly
* defined via the setters
*/
private void fallBackToConfiguration() {
MergeConfig config = MergeConfig.getConfigForCurrentBranch(repo);

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java

@ -129,13 +129,13 @@ public abstract class BasePackFetchConnection extends BasePackConnection
public static final String OPTION_INCLUDE_TAG = GitProtocolConstants.OPTION_INCLUDE_TAG;
/**
* Mutli-ACK support for improved negotiation.
* Multi-ACK support for improved negotiation.
* @since 2.0
*/
public static final String OPTION_MULTI_ACK = GitProtocolConstants.OPTION_MULTI_ACK;
/**
* Mutli-ACK detailed support for improved negotiation.
* Multi-ACK detailed support for improved negotiation.
* @since 2.0
*/
public static final String OPTION_MULTI_ACK_DETAILED = GitProtocolConstants.OPTION_MULTI_ACK_DETAILED;

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java

@ -59,14 +59,14 @@ public final class GitProtocolConstants {
public static final String OPTION_INCLUDE_TAG = "include-tag"; //$NON-NLS-1$
/**
* Mutli-ACK support for improved negotiation.
* Multi-ACK support for improved negotiation.
*
* @since 3.2
*/
public static final String OPTION_MULTI_ACK = "multi_ack"; //$NON-NLS-1$
/**
* Mutli-ACK detailed support for improved negotiation.
* Multi-ACK detailed support for improved negotiation.
*
* @since 3.2
*/

Loading…
Cancel
Save