Top Fields Constructors Methods

org.eclipse.jgit.pgm

pack-priv Class Merge

Class Inheritance

extends TextBuiltin

Annotations

@Command
common:true
usage:usage_MergesTwoDevelopmentHistories

Static Imports

org.eclipse.jgit.lib.Constants.OBJECT_ID_ABBREV_STRING_LENGTH

Field Summary

Modifier and Type	Field and Description
private ContentMergeStrategy	contentStrategy
private MergeCommand.FastForwardMode	ff
private MergeStrategy	mergeStrategy
private String	message
private boolean	noCommit
private String	ref
private boolean	squash
private String	strategyName

Inherited from org.eclipse.jgit.pgm.TextBuiltin:: argWalk db errs errw gitdir ins outs outw

Constructor Summary

Access	Constructor and Description
pack-priv	Merge()

Method Summary

Modifier and Type	Method and Description
pack-priv void	extraArg(String name)
pack-priv void	ff(final boolean ignored)
pack-priv void	ffonly(final boolean ignored)
private Ref	getOldHead()
private boolean	isMergedInto(Ref oldHead, AnyObjectId src)
pack-priv void	noff(final boolean ignored)
protected void	run() Implements abstract org.eclipse.jgit.pgm.TextBuiltin.run. Perform the actions of this command.

Field Detail

contentStrategy	back to summary
private ContentMergeStrategy contentStrategy

ff	back to summary
private MergeCommand.FastForwardMode ff

mergeStrategy	back to summary
private MergeStrategy mergeStrategy

message	back to summary
private String message Annotations @Option name:-m usage:usage_message

noCommit	back to summary
private boolean noCommit Annotations @Option name:--no-commit usage:usage_noCommit

ref	back to summary
private String ref Annotations @Argument required:true metaVar:metaVar_ref usage:usage_mergeRef

squash	back to summary
private boolean squash Annotations @Option name:--squash usage:usage_squash

strategyName	back to summary
private String strategyName Annotations @Option name:--strategy aliases:-s usage:usage_mergeStrategy

Constructor Detail

Merge	back to summary
pack-priv Merge()

Method Detail

extraArg	back to summary
pack-priv void extraArg(String name) Annotations @Option name:--strategy-option aliases:-X metaVar:metaVar_extraArgument usage:usage_extraArgument

ff	back to summary
pack-priv void ff(final boolean ignored) Annotations @Option name:--ff usage:usage_mergeFf

ffonly	back to summary
pack-priv void ffonly(final boolean ignored) Annotations @Option name:--ff-only usage:usage_mergeFfOnly

getOldHead	back to summary
private Ref getOldHead() throws IOException

isMergedInto	back to summary
private boolean isMergedInto(Ref oldHead, AnyObjectId src) throws IOException

noff	back to summary
pack-priv void noff(final boolean ignored) Annotations @Option name:--no-ff usage:usage_mergeNoFf

run back to summary

protected void run()

Implements abstract org.eclipse.jgit.pgm.TextBuiltin.run.

Doc from org.eclipse.jgit.pgm.TextBuiltin.run.

Perform the actions of this command.

This method should only be invoked by execute(String[]).

Annotations

@Override