Skip to content

Commit 032e8da

Browse files
committed
Merge branch 'tb/howto-maintain-git-fixes'
A pair of bugfixes to the Documentation/howto/maintain-git.txt guide. * tb/howto-maintain-git-fixes: Documentation: build redo-seen.sh from jch..seen Documentation: build redo-jch.sh from master..jch
2 parents cf9721c + c805f06 commit 032e8da

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Documentation/howto/maintain-git.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ by doing the following:
231231
- Prepare 'jch' branch, which is used to represent somewhere
232232
between 'master' and 'seen' and often is slightly ahead of 'next'.
233233

234-
$ Meta/Reintegrate master..seen >Meta/redo-jch.sh
234+
$ Meta/Reintegrate master..jch >Meta/redo-jch.sh
235235

236236
The result is a script that lists topics to be merged in order to
237237
rebuild 'seen' as the input to Meta/Reintegrate script. Remove
@@ -283,6 +283,11 @@ by doing the following:
283283

284284
$ git diff jch next
285285

286+
Then build the rest of 'jch':
287+
288+
$ git checkout jch
289+
$ sh Meta/redo-jch.sh
290+
286291
When all is well, clean up the redo-jch.sh script with
287292

288293
$ sh Meta/redo-jch.sh -u
@@ -293,7 +298,7 @@ by doing the following:
293298

294299
- Rebuild 'seen'.
295300

296-
$ Meta/Reintegrate master..seen >Meta/redo-seen.sh
301+
$ Meta/Reintegrate jch..seen >Meta/redo-seen.sh
297302

298303
Edit the result by adding new topics that are not still in 'seen'
299304
in the script. Then

0 commit comments

Comments
 (0)