Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
howto/maintain: document "### match next" convention in jch/pu branch
author
Junio C Hamano
<gitster@pobox.com>
Fri, 25 Jan 2013 20:33:57 +0000
(12:33 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 25 Jan 2013 20:34:43 +0000
(12:34 -0800)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/howto/maintain-git.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ab05d7c
)
diff --git
a/Documentation/howto/maintain-git.txt
b/Documentation/howto/maintain-git.txt
index d90230726489b4600a624e166f3c0c46bc65a102..e4fc2fa4f3c9ace94c7118182d168704d3718d37 100644
(file)
--- 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
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
- 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
$ 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
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
$ 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'.
- Rebuild 'pu'.