diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-23 02:22:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-23 02:22:24 (GMT) |
| commit | 032e8da541e478c7bfbd26a028357a1ccc775525 (patch) | |
| tree | ccd7086e6f101f2c669fbb69f5891765ae0f0ba7 /Documentation/howto | |
| parent | cf9721cc46c902b43bd684cafbab751f8baec2bb (diff) | |
| parent | c805f06b0141f6df1543b7433c20b88028169908 (diff) | |
| download | git-032e8da541e478c7bfbd26a028357a1ccc775525.zip git-032e8da541e478c7bfbd26a028357a1ccc775525.tar.gz git-032e8da541e478c7bfbd26a028357a1ccc775525.tar.bz2 | |
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
Diffstat (limited to 'Documentation/howto')
| -rw-r--r-- | Documentation/howto/maintain-git.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt index 215e2ed..d07c6d4 100644 --- a/Documentation/howto/maintain-git.txt +++ b/Documentation/howto/maintain-git.txt @@ -231,7 +231,7 @@ by doing the following: - Prepare 'jch' branch, which is used to represent somewhere 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 rebuild 'seen' as the input to Meta/Reintegrate script. Remove @@ -283,6 +283,11 @@ by doing the following: $ 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 $ sh Meta/redo-jch.sh -u @@ -293,7 +298,7 @@ by doing the following: - 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' in the script. Then |