On Mon, Sep 30, 2024 at 11:06:03PM +0200, Kristoffer Haugsbakk wrote: > > @@ -165,6 +165,22 @@ by doing the following: > > In practice, almost no patch directly goes to 'master' or > > 'maint'. > > > > + The maintainer is expected to update refs/notes/amlog with a > > + mapping between the applied commit and the 'Message-Id' > > + corresponding to the e-mail which carried the patch. > > + > > + This mapping is created with the aid of the "post-applypatch" hook > > + found in the 'todo' branch. That hook should be installed before > > + applying patches. It is also helpful to carry forward any relevant > > + amlog entries when rebasing, so the following config may be useful: > > + > > + [notes] > > + rewriteref = refs/notes/amlog > > Nit: `[notes]` is indented with spaces while the next line is indented > with a tab. I guess it’s supposed to just be spaces in this context? Oops, good catch, thanks. > It might be worth explicitly mentioning the git-cherry-pick(1) footgun > that Junio talked about in his email: you have to restrict yourself to > git-rebase(1) and `git commit --amend`. Since git-cherry-pick(1) > doesn’t care about (respect?) this configuration. I think that's worth mentioning, and I added a small tidbit in the latest round mentioning it, thanks. Thanks, Taylor
