On Mon, Feb 14, 2022 at 9:32 AM Shaoxuan Yuan <shaoxuan.yuan02@xxxxxxxxx> wrote: > On Fri, Feb 11, 2022 at 1:23 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > FWIW, I have the posted patch plus the following SQUASH??? fix-up > > I'm not so sure what does "SQUASH???" mean especially the three > question marks, i.e. is it just an incidental text or a commit message > convention? It means that you might want to squash the fix-up commit or a similar commit into your commit (or one of your commits in case of a commit/patch series), and then resubmit a new version. > Is it for the convenience of grepping through the > "git log" outputs (cause I found the commit 50d631c71c right away by > grepping through the "git log" output)? It is for convenience that it's named "SQUASH???" as everyone (who is familiar with the mailing list) then knows what needs to be done on the proposed commit(s). > > parked in the 'seen' branch. As the script is quiescent right now, > > I do not mind merging it down, now we spent more time on it ;-) Alternatively as Junio says he is ok with merging that down, you might just accept his offer and he will squash the "SQUASH???" commit for you before merging the result into the "next" branch.
