tasks/ext/git/GitMergeTask.php
Show:
inherited
inherited
Classes
\GitMergeTask
Package: phing\tasks\ext\git
Wrapper aroung git-merge
- Parent(s)
- \GitBaseTask < \Task < \ProjectComponent
- See
- \VersionControl_Git
- Author
- Victor Farazdagi
- Link
- http://www.kernel.org/pub/software/scm/git/docs/git-merge.html
- Since
- 2.4.3
- Version
- $Id: GitMergeTask.php 1084 2011-05-06 09:55:25Z mrook $
Properties
boolean
$commit= 'false'
--commit key of git-merge
Default value
falseDetails- Type
- boolean
boolean
$fastForwardCommit= 'false'
--ff --no-ff keys to git-merge
Default value
falseDetails- Type
- boolean
string
$message= ''
Commit message
Details
- Type
- string
boolean
$noCommit= 'false'
--no-commit key of git-merge
Default value
falseDetails- Type
- boolean
boolean
$quiet= 'false'
--quiet, -q key to git-merge
Default value
falseDetails- Type
- boolean
string
$remote= ''
<commit> of git-merge
Details
- Type
- string
string
$strategy= ''
Merge strategy. See -s <strategy> of git-merge Available strategies are: octopus ours recursive resolve subtree
Details
- Type
- string
string
$strategyOption= ''
-X or --strategy-option of git-merge
Details
- Type
- string
array
$validStrategies= 'array(
'octopus''
Valid merge strategies
Default value
array(
'octopus'Details- Type
- array
Methods
getCommit(
)
:
voidgetDescription(
)
:
voidgetFastForwardCommit(
)
:
voidgetGitClient(
)
:
voidgetGitPath(
)
:
voidgetLocation(
)
:
voidgetMessage(
)
:
voidgetNoCommit(
)
:
voidgetOwningTarget(
)
:
voidgetProject(
)
:
voidgetQuiet(
)
:
voidgetRegisterSlot(
)
:
voidgetRemote(
)
:
voidgetRepository(
)
:
voidgetRuntimeConfigurableWrapper(
)
:
voidgetStrategy(
)
:
voidgetStrategyOption(
)
:
voidgetTaskName(
)
:
voidgetTaskType(
)
:
voidinit(
)
:
voidisCommit(
)
:
voidisFastForwardCommit(
)
:
voidisNoCommit(
)
:
voidisQuiet(
)
:
voidlog(
)
:
voidmain(
)
:
voidThe main entry point for the task
maybeConfigure(
)
:
voidperform(
)
:
voidsetCommit(
$flag
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setDescription(
)
:
voidsetFastForwardCommit(
$flag
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setGitPath(
)
:
voidsetLocation(
)
:
voidsetMessage(
$message
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $message |
setNoCommit(
$flag
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setOwningTarget(
)
:
voidsetProject(
)
:
voidsetQuiet(
$flag
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setRemote(
$remote
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $remote |
setRepository(
)
:
voidsetRuntimeConfigurableWrapper(
)
:
voidsetStrategy(
$strategy
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $strategy |
setStrategyOption(
$strategyOption
)
:
void
Parameters
| Name | Type | Description |
|---|---|---|
| $strategyOption |
setTaskName(
)
:
voidsetTaskType(
)
:
void