# tasks/ext/git/GitMergeTask.php

## \GitMergeTask
jump to top

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 `false` Details

Type
  boolean

`boolean $fastForwardCommit= 'false'`

--ff --no-ff keys to git-merge

Default value `false` Details

Type
  boolean

`string $message= ''`

Commit message

Details

Type
  string

`boolean $noCommit= 'false'`

--no-commit key of git-merge

Default value `false` Details

Type
  boolean

`boolean $quiet= 'false'`

--quiet, -q key to git-merge

Default value `false` Details

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( ) : void`

`getDescription( ) : void`

`getFastForwardCommit( ) : void`

`getGitClient( ) : void`

`getGitPath( ) : void`

`getLocation( ) : void`

`getMessage( ) : void`

`getNoCommit( ) : void`

`getOwningTarget( ) : void`

`getProject( ) : void`

`getQuiet( ) : void`

`getRegisterSlot( ) : void`

`getRemote( ) : void`

`getRepository( ) : void`

`getRuntimeConfigurableWrapper( ) : void`

`getStrategy( ) : void`

`getStrategyOption( ) : void`

`getTaskName( ) : void`

`getTaskType( ) : void`

`init( ) : void`

`isCommit( ) : void`

`isFastForwardCommit( ) : void`

`isNoCommit( ) : void`

`isQuiet( ) : void`

`log( ) : void`

`main( ) : void`

The main entry point for the task

`maybeConfigure( ) : void`

`perform( ) : void`

`setCommit( $flag ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$flag |  |

`setDescription( ) : void`

`setFastForwardCommit( $flag ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$flag |  |

`setGitPath( ) : void`

`setLocation( ) : void`

`setMessage( $message ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$message |  |

`setNoCommit( $flag ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$flag |  |

`setOwningTarget( ) : void`

`setProject( ) : void`

`setQuiet( $flag ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$flag |  |

`setRemote( $remote ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$remote |  |

`setRepository( ) : void`

`setRuntimeConfigurableWrapper( ) : void`

`setStrategy( $strategy ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$strategy |  |

`setStrategyOption( $strategyOption ) : void`

Parameters

Name | Type | Description
--- | --- | ---
$strategyOption |  |

`setTaskName( ) : void`

`setTaskType( ) : void`

Documentation was generated by DocBlox 0.17.1.