On 23/05/18 16:50, Benjamin Kaduk wrote: > On Wed, May 23, 2018 at 03:12:30PM +0000, Dr. Matthias St. Pierre wrote: >>> So do you guys use the ghmerge script or own procedures? I'm curious. >> >> At the beginnning, I tried to use ghmerge but it was not flexible >> enough for my needs. In particular, it only gives me the choice >> between squashing everything or leaving everything as it is. Most >> notably, it does not support partial squashing by interactive >> rebasing. Or alternatively: pausing + letting me fix something + >> resuming. What I also dislike is that it uses a lot of GitHub API > > Sorry for partially hijacking the thread, but this reminds me that > several people have started using the "git commit --fixup" tooling, > which is in general helpful for the reviewer (to know what the > squashing intention is).
It's also helpful because it preserves the history of the review (you can see what changed since the last time you looked at it). > > But I am curious if we currently do and/or should have a commit hook > on git.openssl.org to reject commits that start with "!fixup". Not that I know of. We probably should have. A quick check reveals two such commits that have made it into master...both mine unfortunately :-( Matt _______________________________________________ openssl-project mailing list [email protected] https://mta.openssl.org/mailman/listinfo/openssl-project
