From 720f13d8d588156dc85229af3c3820c5bf0f1362 Mon Sep 17 00:00:00 2001 From: chdiza Date: Wed, 10 Dec 2014 14:16:55 -0500 Subject: [PATCH] Cookbook: Fix the link for squashing-instructions Closes Homebrew/homebrew#34859. Signed-off-by: Misty De Meo --- share/doc/homebrew/Formula-Cookbook.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/doc/homebrew/Formula-Cookbook.md b/share/doc/homebrew/Formula-Cookbook.md index e60e2d8054..a1db39c0a2 100644 --- a/share/doc/homebrew/Formula-Cookbook.md +++ b/share/doc/homebrew/Formula-Cookbook.md @@ -366,7 +366,7 @@ Now, please open a Pull Request (on your github repo page) for new and updated b * One formula per commit; one commit per formula * Keep merge commits out of the request -* If you have any merge or mixup commits, please [squash](http://www.gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) them. +* If you have any merge or mixup commits, please [squash](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) them. If a commit touches multiple files, or isn’t one logical bug fix, or a file is touched in multiple commits, we’ll probably ask you to `rebase` and `squash` your commits. For this reason, you should avoid pushing to your `master` branch. Note, after rebase and/or squash, you'll need to push with `--force` to your remote.