On Wed, Feb 12, 2025, Brendan Jackman wrote:
> They apply to 60675d4ca1ef0 ("Merge branch 'linus' into x86/mm, to
> pick up fixes").
>
> Rik, can I refer you to the BASE TREE INFORMATION section of man
> git-format-patch. I haven't used that feature lately (b4 takes care of
> this) but it looks like --base=auto will add the necessary info, or
> IIRC there's a way to make that behaviour the default.
IMO, --base=auto is too easy to unintentionally misuse, e.g. it will do the wrong
thing if your upstream branch is set to a personal repository. --base itself is
fantastic though. I personally do:
git format-patch --base=HEAD~$nr <bunch of other stuff> -$nr
where $nr is the number of patches in the series. I.e. advertise the base as
whatever the series of patches is based on, not what the branch is based on. The
only time it doesn't work is if your local branch has a commit that is not in the
series, and is not publicly visible. E.g. if the series depends on another in-flight
series that you've applied locally. But in that case, you should be explaining
what's up in your cover letter no matter what.
