Package org.eclipse.jgit.pgm
Class Merge
java.lang.Object
org.eclipse.jgit.pgm.TextBuiltin
org.eclipse.jgit.pgm.Merge
-
Nested Class Summary
Nested classes/interfaces inherited from class org.eclipse.jgit.pgm.TextBuiltin
TextBuiltin.TerminatedByHelpException -
Field Summary
FieldsModifier and TypeFieldDescriptionprivate ContentMergeStrategyprivate MergeCommand.FastForwardModeprivate MergeStrategyprivate Stringprivate booleanprivate Stringprivate booleanprivate String -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescription(package private) void(package private) voidff(boolean ignored) (package private) voidffonly(boolean ignored) private Refprivate booleanisMergedInto(Ref oldHead, AnyObjectId src) (package private) voidnoff(boolean ignored) protected voidrun()Perform the actions of this command.Methods inherited from class org.eclipse.jgit.pgm.TextBuiltin
abbreviateRef, containsHelp, die, die, die, die, execute, getErrorWriter, getOutputWriter, getRepository, getResourceBundle, init, initRaw, parseArguments, printUsage, printUsageAndExit, printUsageAndExit, requiresRepository, resolve, setCommandName
-
Field Details
-
strategyName
-
squash
private boolean squash -
noCommit
private boolean noCommit -
mergeStrategy
-
ref
-
ff
-
message
-
contentStrategy
-
-
Constructor Details
-
Merge
Merge()
-
-
Method Details
-
ff
void ff(boolean ignored) -
noff
void noff(boolean ignored) -
ffonly
void ffonly(boolean ignored) -
extraArg
-
run
protected void run()Perform the actions of this command.This method should only be invoked by
TextBuiltin.execute(String[]).- Specified by:
runin classTextBuiltin
-
getOldHead
- Throws:
IOException
-
isMergedInto
- Throws:
IOException
-