Skip to content

Commit d4e5896

Browse files
committed
Minor update to how-to maintain git
A few more parts of this document is stale that needs updating to reflect the reality, but I do not regularly rebase topics that are only in "pu" anymore, which may be noteworthy for a commit. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 50963ba commit d4e5896

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Documentation/howto/maintain-git.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ by doing the following:
176176
- Update "What's cooking" message to review the updates to
177177
existing topics, newly added topics and graduated topics.
178178

179-
This step is helped with Meta/UWC script (where Meta/ contains
179+
This step is helped with Meta/cook script (where Meta/ contains
180180
a checkout of the 'todo' branch).
181181

182182
- Merge topics to 'next'. For each branch whose tip is not
@@ -197,10 +197,9 @@ by doing the following:
197197

198198
- Nothing is next-worthy; do not do anything.
199199

200-
- Rebase topics that do not have any commit in next yet. This
201-
step is optional but sometimes is worth doing when an old
202-
series that is not in next can take advantage of low-level
203-
framework change that is merged to 'master' already.
200+
- [** OBSOLETE **] Optionally rebase topics that do not have any commit
201+
in next yet, when they can take advantage of low-level framework
202+
change that is merged to 'master' already.
204203

205204
$ git rebase master ai/topic
206205

@@ -209,7 +208,7 @@ by doing the following:
209208
pre-rebase hook to make sure that topics that are already in
210209
'next' are not rebased beyond the merged commit.
211210

212-
- Rebuild "pu" to merge the tips of topics not in 'next'.
211+
- [** OBSOLETE **] Rebuild "pu" to merge the tips of topics not in 'next'.
213212

214213
$ git checkout pu
215214
$ git reset --hard next
@@ -241,7 +240,7 @@ by doing the following:
241240

242241
- Fetch html and man branches back from k.org, and push four
243242
integration branches and the two documentation branches to
244-
repo.or.cz
243+
repo.or.cz and other mirrors.
245244

246245

247246
Some observations to be made.

0 commit comments

Comments
 (0)