From a48e5e748426d2d092d8ba88c782f8ad9e8b0a52 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Thu, 17 Jan 2019 20:38:23 -0600 Subject: [PATCH 1/2] HACKING:remove rule that shouldn't be used This is suggested due to a conversation in IRC with @elextr @codebrainz. The squashing if done, should be done by the person merging, otherwise the submitter has to rebase or force-push... --- HACKING | 2 -- 1 file changed, 2 deletions(-) diff --git a/HACKING b/HACKING index 45b4852ce9..73d8f94884 100644 --- a/HACKING +++ b/HACKING @@ -89,8 +89,6 @@ Please, make sure contributions you make follow these rules: * only one feature should be in each pull request (or patch). * pull requests (or patches) should not contain changes unrelated to the feature, and commits should be sensible units of change. -* the submitter should squash together corrections that are part of - the development process, especially correcting your own mistakes. * Please make sure your modifications follow the style of existing code: see `Coding`_ for more information. From a6067e5f04fd7c7cdbe1fa539f1d194c55a5df84 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Sat, 11 Dec 2021 19:16:49 -0600 Subject: [PATCH 2/2] add rule about using 'commit --amend' --- HACKING | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HACKING b/HACKING index 73d8f94884..4311b91430 100644 --- a/HACKING +++ b/HACKING @@ -89,6 +89,9 @@ Please, make sure contributions you make follow these rules: * only one feature should be in each pull request (or patch). * pull requests (or patches) should not contain changes unrelated to the feature, and commits should be sensible units of change. +* If making minor corrections to a previous commit, the submitter should use + 'commit --amend' (if the branch has already been pushed, then push again using + 'force'). * Please make sure your modifications follow the style of existing code: see `Coding`_ for more information.