git-commit-vandalism/Documentation/howto
Taylor Blau 7fa56b1a00 Documentation: build redo-jch.sh from master..jch
Rebuilding the 'jch' branch begins by reintegrating any topics between
'master' and 'jch', not 'master' and 'seen'.

In the maintainer guide, the documentation isn't quite right, since the
initial input to Meta/Reintegrate is "master..seen", not "master..jch".
This can lead to confusing results when generating the Meta/redo-jch.sh
script for the first time.

Additionally, rebuilding 'jch' takes place in two steps. First, running
the script up to the first "### match next" cut-line, and then comparing
the result with what's on 'next' (i.e. with "git diff jch next"). Then,
the remaining set of topics get merged down to 'jch' (which aren't on
'next') by running the entire "redo-jch.sh" script.

Clarify the documentation to reflect this.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-31 18:52:16 -04:00
..
coordinate-embargoed-releases.txt Document how we do embargoed releases 2021-03-27 15:13:12 -07:00
keep-canonical-history-correct.txt How to keep a project's canonical history correct. 2014-05-28 13:35:43 -07:00
maintain-git.txt Documentation: build redo-jch.sh from master..jch 2022-10-31 18:52:16 -04:00
new-command.txt new-command.txt: correct the command description file 2016-06-27 06:11:57 -07:00
rebase-from-internal-branch.txt docs: adjust the technical overview for the rename pu -> seen 2020-06-25 09:18:55 -07:00
rebuild-from-update-hook.txt doc: use https links to avoid http redirect 2017-04-20 22:05:37 -07:00
recover-corrupted-blob-object.txt The name of the hash function is "SHA-1", not "SHA1" 2013-04-15 11:08:37 -07:00
recover-corrupted-object-harder.txt docs: move pack format docs to man section 5 2022-08-04 14:12:24 -07:00
revert-a-faulty-merge.txt doc: fix the 'revert a faulty merge' ASCII art tab spacing 2016-10-24 18:09:46 -07:00
revert-branch-rebase.txt docs: adjust the technical overview for the rename pu -> seen 2020-06-25 09:18:55 -07:00
separating-topic-branches.txt Documentation: fix a bunch of typos, both old and new 2019-11-07 13:42:00 +09:00
setup-git-server-over-http.txt doc: format pathnames and URLs as monospace. 2019-03-13 11:14:22 +09:00
update-hook-example.txt docs: adjust the technical overview for the rename pu -> seen 2020-06-25 09:18:55 -07:00
use-git-daemon.txt Documentation: the name of the system is 'Git', not 'git' 2013-02-01 13:53:33 -08:00
using-merge-subtree.txt howto/using-merge-subtree: mention --allow-unrelated-histories 2018-10-25 14:45:15 +09:00
using-signed-tag-in-pull-request.txt Documentation: the name of the system is 'Git', not 'git' 2013-02-01 13:53:33 -08:00