gear-merge-rules(5)
| GEAR-MERGE-RULES(5) | File Formats | GEAR-MERGE-RULES(5) |
NAME
gear-merge-rules - rule file for gear-merge
DESCRIPTION
The rule file specifies actions of gear-merge(1) required to merge branches in the package repository.
FORMAT
A rule file consists of lines of the following format:
directive: <from-branch> <to-branch> [arguments ...]
Empty lines and lines beginning with “#” are ignored. Directive arguments are delimited by whitespace characters.
COMMON ARGUMENTS
- squash
- It is the same as git merge --squash. See git-merge(1).
- strategy=<STRATEGY>
- It is the same as git merge --strategy=<STRATEGY>.
DIRECTIVES
- merge: <from-branch> <to-branch> [options ...]
- Call git-merge to merge the retrieved <from-branch> into the <to-branch> branch.
- Valid options are:
- message=<MESSAGE>
- The commit message to be used for the merge commit.
- gendiff: <from-branch> <to-branch> name=<FILENAME> [options ...]
- Valid options are:
- name=<FILENAME>
- Write result to file <FILENAME>.
- message=<MESSAGE>
- The comment is added in the beginning of a diff.
- unified=<N>
- Generate diffs with <n> lines of context instead of the usual three. See git-diff(1).
FILES
- .gear/merge
- The gear-merge(1) expect to find rules, unless another name is specified by the --rules=filename option.
AUTHOR
This manual page written by Alexey Gladkov <legion@altlinux.org>.
Authors and contributors of the programs included in the gear package are listed in the manual pages for these programs.
SEE ALSO
| December 2009 | gear 2.6.0 |