class Merge extends TextBuiltin
TextBuiltin.TerminatedByHelpException
Modifier and Type | Field and 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 and Description |
---|
Merge() |
Modifier and Type | Method and 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.
|
abbreviateRef, containsHelp, die, die, die, die, execute, getErrorWriter, getOutputWriter, getRepository, getResourceBundle, init, initRaw, parseArguments, printUsage, printUsageAndExit, printUsageAndExit, requiresRepository, resolve, setCommandName
private java.lang.String strategyName
private boolean squash
private boolean noCommit
private MergeStrategy mergeStrategy
private java.lang.String ref
private MergeCommand.FastForwardMode ff
private java.lang.String message
void ff(boolean ignored)
void noff(boolean ignored)
void ffonly(boolean ignored)
protected void run()
This method should only be invoked by TextBuiltin.execute(String[])
.
run
in class TextBuiltin
private Ref getOldHead() throws java.io.IOException
java.io.IOException
private boolean isMergedInto(Ref oldHead, AnyObjectId src) throws java.io.IOException
java.io.IOException