> On Apr 11, 2017, at 12:25 PM, Terry Reedy <tjre...@udel.edu> wrote: > > On 4/10/2017 11:55 PM, Martin Panter wrote: >> On 11 April 2017 at 13:13, Mariatta Wijaya <mariatta.wij...@gmail.com> wrote: >>> "View Changes" doesn't work when commits in PR were squashed, which seems to >>> be the case in https://github.com/python/cpython/pull/851 >>> >>> I wonder if there is a way to unsquash the commits? Will it help with >>> reviewing this PR? > >> In this particular pull request, I think the submitter has rebased >> their commit, and force-pushed it. These days, I notice Git Hub seems >> to forget old commits pretty soon after you force-push the branch they >> are on. I don't think you can "unsquash" them retrospectively; you >> would need a copy of the old commits saved somewhere. >> >> Other times people add revised commits on top of their old commits, >> which would have been easier for me in this situation, but I suspect >> that makes it harder for the person pushing the final change if they >> have to squash it into a single commit. (I noticed the eventual commit >> message is often messy, redundant, automatically generated, etc.) > > I was under the impression that the green [commit] button would do the > squashing. Or at least that it could. >
Yes it can, and IIRC for CPython we have it set so it _only_ does that. Although the commit message may be ugly if you don’t adjust it in the text editor that pops up when GitHub asks you to confirm the merge since it by default just concats all of the commit messages into a list so you might get a commit message like: * implement feature * fix thing * ugh * address review Instead of a nice clean one. That’s going to be up to the person hitting the merge button to edit the commit message to be clean though. — Donald Stufft
_______________________________________________ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
