summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2022-10-31 18:43:44 -0400
committerTaylor Blau <me@ttaylorr.com>2022-10-31 18:52:16 -0400
commit7fa56b1a002338cba17013e904ee095813bb772c (patch)
treeb88b1508ec116a00a5f5123540e40fa6388ad652 /commit.h
parent6c3b077c7189606f262bbe6a2f296a52dcf67f08 (diff)
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>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions