Package org.eclipse.jgit.pgm
Class Merge
- java.lang.Object
-
- org.eclipse.jgit.pgm.TextBuiltin
-
- org.eclipse.jgit.pgm.Merge
-
class Merge extends TextBuiltin
-
-
Nested Class Summary
-
Nested classes/interfaces inherited from class org.eclipse.jgit.pgm.TextBuiltin
TextBuiltin.TerminatedByHelpException
-
-
Field Summary
Fields Modifier and Type Field Description private MergeCommand.FastForwardMode
ff
private MergeStrategy
mergeStrategy
private java.lang.String
message
private boolean
noCommit
private java.lang.String
ref
private boolean
squash
private java.lang.String
strategyName
-
Constructor Summary
Constructors Constructor Description Merge()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description (package private) void
ff(boolean ignored)
(package private) void
ffonly(boolean ignored)
private Ref
getOldHead()
private boolean
isMergedInto(Ref oldHead, AnyObjectId src)
(package private) void
noff(boolean ignored)
protected void
run()
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 Detail
-
strategyName
private java.lang.String strategyName
-
squash
private boolean squash
-
noCommit
private boolean noCommit
-
mergeStrategy
private MergeStrategy mergeStrategy
-
ref
private java.lang.String ref
-
ff
private MergeCommand.FastForwardMode ff
-
message
private java.lang.String message
-
-
Method Detail
-
ff
void ff(boolean ignored)
-
noff
void noff(boolean ignored)
-
ffonly
void ffonly(boolean ignored)
-
run
protected void run()
Perform the actions of this command.This method should only be invoked by
TextBuiltin.execute(String[])
.- Specified by:
run
in classTextBuiltin
-
getOldHead
private Ref getOldHead() throws java.io.IOException
- Throws:
java.io.IOException
-
isMergedInto
private boolean isMergedInto(Ref oldHead, AnyObjectId src) throws java.io.IOException
- Throws:
java.io.IOException
-
-