Skip to content

Commit e510f2d

Browse files
committed
howto/maintain: document "### match next" convention in jch/pu branch
Signed-off-by: Junio C Hamano <[email protected]>
1 parent ab05d7c commit e510f2d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Documentation/howto/maintain-git.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ by doing the following:
210210
The result is a script that lists topics to be merged in order to
211211
rebuild 'pu' as the input to Meta/Reintegrate script. Remove
212212
later topics that should not be in 'jch' yet. Add a line that
213-
consists of '###' before the name of the first topic in the output
214-
that should be in 'jch' but not in 'next' yet.
213+
consists of '### match next' before the name of the first topic
214+
in the output that should be in 'jch' but not in 'next' yet.
215215

216216
- Now we are ready to start merging topics to 'next'. For each
217217
branch whose tip is not merged to 'next', one of three things can
@@ -233,7 +233,8 @@ by doing the following:
233233
$ Meta/redo-jch.sh -c1
234234

235235
to rebuild the 'jch' branch from scratch. "-c1" tells the script
236-
to stop merging at the '###' line you added earlier.
236+
to stop merging at the first line that begins with '###'
237+
(i.e. the "### match next" line you added earlier).
237238

238239
At this point, build-test the result. It may reveal semantic
239240
conflicts (e.g. a topic renamed a variable, another added a new
@@ -261,8 +262,8 @@ by doing the following:
261262
$ sh Meta/redo-jch.sh -u
262263

263264
This removes topics listed in the script that have already been
264-
merged to 'master'. This unfortunately loses the "###" marker,
265-
so add it again to the appropriate place.
265+
merged to 'master'. This may lose '### match next' marker;
266+
add it again to the appropriate place when it happens.
266267

267268
- Rebuild 'pu'.
268269

0 commit comments

Comments
 (0)