classes/phing/tasks/ext/git/GitMergeTask.php
Classes
\GitMergeTask
Wrapper aroung git-merge
Use {@link Project#createTask} to register a new Task.
- Extends from
- \GitBaseTask
- see
- \VersionControl_Git
- author
- Victor Farazdagi
- copyright
- 2001,2002 THYRELL. All rights reserved
- link
- http://www.kernel.org/pub/software/scm/git/docs/git-merge.html
- package
- phing.tasks.ext.git
- 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
falseDetails- Type
- boolean
boolean
$fastForwardCommit= 'false'
--ff --no-ff keys to git-merge
falseDetails- Type
- boolean
string
$message= ''
Commit message
- Type
- string
boolean
$noCommit= 'false'
--no-commit key of git-merge
falseDetails- Type
- boolean
boolean
$quiet= 'false'
--quiet, -q key to git-merge
falseDetails- Type
- boolean
string
$remote= ''
<commit> of git-merge
- Type
- string
string
$strategy= ''
Merge strategy. See -s <strategy> of git-merge Available strategies are: octopus ours recursive resolve subtree
- Type
- string
string
$strategyOption= ''
-X or --strategy-option of git-merge
- Type
- string
array
$validStrategies= 'array'
Valid merge strategies
arrayDetails- Type
- array
Methods
getCommit(
)
:
getFastForwardCommit(
)
:
getMessage(
)
:
getNoCommit(
)
:
getQuiet(
)
:
getRemote(
)
:
getStrategy(
)
:
getStrategyOption(
)
:
isCommit(
)
:
isFastForwardCommit(
)
:
isNoCommit(
)
:
isQuiet(
)
:
main(
)
:
The main entry point for the task
setCommit(
$flag
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setFastForwardCommit(
$flag
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setMessage(
$message
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $message |
setNoCommit(
$flag
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setQuiet(
$flag
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $flag |
setRemote(
$remote
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $remote |
setStrategy(
$strategy
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $strategy |
setStrategyOption(
$strategyOption
)
:
Parameters
| Name | Type | Description |
|---|---|---|
| $strategyOption |