diff options
| author | chdiza | 2014-12-10 14:16:55 -0500 |
|---|---|---|
| committer | Misty De Meo | 2014-12-10 11:25:44 -0800 |
| commit | d2afff769cbe6bfc62f97bac6692a04986dfd810 (patch) | |
| tree | 7ae93442929c9f4cd6ad8e467f2898cf3a314064 /share | |
| parent | b5dd4bade89d7168566311f219119f63af734628 (diff) | |
| download | homebrew-d2afff769cbe6bfc62f97bac6692a04986dfd810.tar.bz2 | |
Cookbook: Fix the link for squashing-instructions
Closes #34859.
Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/doc/homebrew/Formula-Cookbook.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/doc/homebrew/Formula-Cookbook.md b/share/doc/homebrew/Formula-Cookbook.md index e60e2d805..a1db39c0a 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. |