From 14981e6265f27a1439778bb894be283a9e741066 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 15 May 2015 09:35:36 +0100 Subject: [PATCH] How to Open A PR: clarify one commit per formula. --- .../How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md b/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md index 87fc951481..4804fa11f8 100644 --- a/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md +++ b/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md @@ -29,7 +29,7 @@ To make changes based on feedback: 1. Checkout your branch again with `git checkout YOUR_BRANCH_NAME` 2. Make any requested changes and commit them with `git add` and `git commit` -3. Squash new commits into one change per formula with `git rebase --interactive origin/master` +3. Squash new commits into one commit per formula with `git rebase --interactive origin/master` 4. Push to the fork's remote branch and the pull request with `git push --force` Once all feedback has been addressed and if it's a change we want to include (we include most changes) then we'll add your commit to Homebrew. Note it will not show up as "Merged" because of the way we include contributions.