-
Notifications
You must be signed in to change notification settings - Fork 0
/
gear-merge-rules.5.in
117 lines (117 loc) · 2.59 KB
/
gear-merge-rules.5.in
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
.\" Copyright (C) 2007 Alexey Gladkov <[email protected]>
.\" Copyright (C) 2009 Dmitry V. Levin <[email protected]>
.\"
.\" This file is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
.\" the Free Software Foundation; either version 2 of the License, or
.\" (at your option) any later version.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.
.TH "GEAR-MERGE-RULES" "5" "December 2009" "gear @VERSION@" "File Formats"
.SH NAME
gear\-merge\-rules \- rule file for gear\-merge
.
.
.SH DESCRIPTION
.
The rule file specifies actions of
.BR gear\-merge (1)
required to merge branches in the package repository.
.
.
.SH FORMAT
.
A rule file consists of lines of the following format:
.RS 4
.PP
.IB directive\^ :
.IR <from-branch>
.IR <to-branch>
.IR [arguments\ ...]
.RE
.
.PP
Empty lines and lines beginning with \*(lq#\*(rq are ignored.
Directive arguments are delimited by whitespace characters.
.
.
.SH COMMON ARGUMENTS
.TP
.BI "squash"
It is the same as git merge --squash. See
.BR git\-merge (1).
.TP
.BI strategy= <STRATEGY>
It is the same as git merge --strategy=<STRATEGY>.
.
.
.SH DIRECTIVES
.
.TP
.BI "merge: <from-branch> <to-branch> "[options\ ...]
Call git\-merge to merge the retrieved
.IR <from-branch>
into the
.IR <to-branch>
branch.
.IP
Valid options are:
.RS
.TP
.BI message= <MESSAGE>
The commit message to be used for the merge commit.
.RE
.
.TP
.BI "gendiff: <from-branch> <to-branch> " "name=<FILENAME> [options\ ...]"
.IP
Valid options are:
.RS
.TP
.BI name= <FILENAME>
Write result to file
.IR <FILENAME>.
.
.TP
.BI message= <MESSAGE>
The comment is added in the beginning of a diff.
.
.TP
.BI unified= <N>
Generate diffs with <n> lines of context instead of the usual three. See
.BR git\-diff (1).
.
.
.SH FILES
.TP
.BR .gear/merge
The
.BR gear\-merge (1)
expect to find rules, unless another name is specified by the
.BI \-\-rules= filename
option.
.
.
.SH AUTHOR
.PP
This manual page written by Alexey Gladkov <[email protected]>.
.PP
Authors and contributors of the programs included in the
.B gear
package are listed in the manual pages for these programs.
.
.
.SH SEE ALSO
.PP
.na
.nh
.tr -\(hy
.BR gear\-merge (1).