Never mind, I apparently can not read 🐑 http://matplotlib.org/devel/gitwash/development_workflow.html

Sorry for the noise.

#2742 <- most of this content is gone

Looks like this is a result of #8137

Just a quick thought on this text - it might be worth highlighting the interactive rebase earlier on. This is probably going to be more useful for committers who are asked to squash before merge.

Right now it's in a section after the first mention of rebase:

http://matplotlib.org/devel/gitwash/development_workflow.html?highlight=rebase#rewriting-commit-history

It isn't the easiest to discover. Maybe the rebase section just needs a "see for more ways to rebase", or maybe just adding in the words "squash before merge" etc so that people can ctrl+f it more easily. WDYT?

Which text is 'this text'?

Compare what we publish now with https://github.com/tacaswell/matplotlib/blob/9efe5e36b57bf11fb2bfd7e9229c06656fd10bff/doc/devel/gitwash/development_workflow.rst

I'm just saying that if I were a new user opening a PR, looking for an explanation of how to squash a bunch of commits before merging, then this:

http://matplotlib.org/devel/gitwash/development_workflow.html?highlight=git%20rebase#rewriting-commit-history

is what I should use, but it'd be hard for me to find it. I think if the words "squash and merge" or something like this were in there, it'd be easier to find, ctrl+f for, etc. Also I think if there were something like

.. note::
   For interactive rebasing (used to squash multiple commits together),
   see :ref:`rewriting-commit-history`.

in this section:

http://matplotlib.org/devel/gitwash/development_workflow.html?highlight=git%20rebase#rebasing-on-trunk

it'd be easier to find

matthew-brett/gitwash#13 ports the missing text to upstream gitwash.

Is this closed since we have rebase documentation now? https://matplotlib.org/devdocs/devel/development_workflow.html#rebasing-on-upstream-main

This issue has been marked "inactive" because it has been 365 days since the last comment. If this issue is still present in recent Matplotlib releases, or the feature request is still wanted, please leave a comment and this label will be removed. If there are no updates in another 30 days, this issue will be automatically closed, but you are free to re-open or create a new issue if needed. We value issue reports, and this procedure is meant to help us resurface and prioritize issues that have not been addressed yet, not make them disappear. Thanks for your help!

Done per #8398 (comment).