kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2022-11-23 11:22:24 +09:00
parent cf9721cc46 c805f06b01
commit 032e8da541
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/howto/maintain-git.txt
View File

@ -231,7 +231,7 @@ by doing the following:
- Prepare 'jch' branch, which is used to represent somewhere - Prepare 'jch' branch, which is used to represent somewhere
between 'master' and 'seen' and often is slightly ahead of 'next'. between 'master' and 'seen' and often is slightly ahead of 'next'.


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


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


$ git diff jch next $ git diff jch next


Then build the rest of 'jch':

$ git checkout jch
$ sh Meta/redo-jch.sh

When all is well, clean up the redo-jch.sh script with When all is well, clean up the redo-jch.sh script with


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


- Rebuild 'seen'. - Rebuild 'seen'.


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


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