summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-25 20:33:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-25 20:34:43 (GMT)
commite510f2d610b30013675c9b08bae92a9cfc4b5907 (patch)
tree17143e4b70de1e73c56be80621a27e7d6988eb0f /Documentation/howto
parentab05d7c7361afa123e63767da7c1f85e66d0028f (diff)
downloadgit-e510f2d610b30013675c9b08bae92a9cfc4b5907.zip
git-e510f2d610b30013675c9b08bae92a9cfc4b5907.tar.gz
git-e510f2d610b30013675c9b08bae92a9cfc4b5907.tar.bz2
howto/maintain: document "### match next" convention in jch/pu branch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto')
-rw-r--r--Documentation/howto/maintain-git.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index d902307..e4fc2fa 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -210,8 +210,8 @@ by doing the following:
The result is a script that lists topics to be merged in order to
rebuild 'pu' as the input to Meta/Reintegrate script. Remove
later topics that should not be in 'jch' yet. Add a line that
- consists of '###' before the name of the first topic in the output
- that should be in 'jch' but not in 'next' yet.
+ consists of '### match next' before the name of the first topic
+ in the output that should be in 'jch' but not in 'next' yet.
- Now we are ready to start merging topics to 'next'. For each
branch whose tip is not merged to 'next', one of three things can
@@ -233,7 +233,8 @@ by doing the following:
$ Meta/redo-jch.sh -c1
to rebuild the 'jch' branch from scratch. "-c1" tells the script
- to stop merging at the '###' line you added earlier.
+ to stop merging at the first line that begins with '###'
+ (i.e. the "### match next" line you added earlier).
At this point, build-test the result. It may reveal semantic
conflicts (e.g. a topic renamed a variable, another added a new
@@ -261,8 +262,8 @@ by doing the following:
$ sh Meta/redo-jch.sh -u
This removes topics listed in the script that have already been
- merged to 'master'. This unfortunately loses the "###" marker,
- so add it again to the appropriate place.
+ merged to 'master'. This may lose '### match next' marker;
+ add it again to the appropriate place when it happens.
- Rebuild 'pu'.