admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Cookbook: Fix the link for squashing-instructions

Browse Source 
Closes Homebrew/homebrew#34859.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
This commit is contained in:
chdiza 2014-12-10 14:16:55 -05:00 committed by Misty De Meo
parent 5201411a6d
commit 720f13d8d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/doc/homebrew/Formula-Cookbook.md
View File

@ -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 * One formula per commit; one commit per formula
* Keep merge commits out of the request * 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. 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.