From 7eb6873ba0f9fec4cc8896cba00730d2157f8eed Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sun, 28 Jan 2018 23:15:50 +0000 Subject: [PATCH] maintainers-guide: cleanup msg when squashing --- contributing-guides/maintainers-guide.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contributing-guides/maintainers-guide.md b/contributing-guides/maintainers-guide.md index 82ca31b61..307bf56e6 100644 --- a/contributing-guides/maintainers-guide.md +++ b/contributing-guides/maintainers-guide.md @@ -84,9 +84,10 @@ as a guideline for current and future maintainers. If there's a single commit in the PR, or if the multiple commits are not semantically independent changes, use the `Squash and merge` method. - If the PR author took the time to craft + (Don't forget to clean up the body of the squashed commit message.) + If instead the PR author took the time to craft individual, informative messages for each commit, - use the `Rebase and merge` method, + then use the `Rebase and merge` method, to honor that work and preserve the history of the changes. For less clear-cut cases, a simple heuristic you can follow is that if there are more "dirty" commits than "clean" commits,