Re: [PATCH v3 0/3] branch: let --delete-merged find squash merged branches
- From
Harald Nordgren <haraldnordgren@gmail.com>
- Date
- Oct 22, 2026, 07:18 UTC
- Message-ID
- <CAHwyqnXcdgzRnFgFhTfhQFFOgDxUUKoPf2sGViBTiXMK1aNttw@mail.gmail.com>
- In-Reply-To
- <xmqqjynajndt.fsf@gitster.g>
Show 13 quoted lines
> It would be very surprising for the unsuspecting users to loosen the > behaviour of "--delete-merged" like this series does. As requested > elsewhere [*], do not change the behaviour of the "--delete-merged" > when no other "please make it looser" option requests otherwise. > > * https://lore.kernel.org/git/20261019044005.99247-1-me@jaspermayone.com/ > > The attached new test illustrates the extent of damage. We add a > file on a private branch while the upstream adds two files, one of > which has an identical contents to our file, under author identity > different from ours. If we run "--delete-merged" in our repository, > we should not lose our branch that we never pushed, or asked them to > pull, or anything. But when applied on top of this series, we do.
Ok.
So do we go with `--delete-irrelevant` or `--delete-irrelevant=squashed,rebased` to give us two levels here? I'd rather do the former.
Harald