From: Florian Forster Date: Thu, 13 Aug 2020 07:19:55 +0000 (+0200) Subject: docs/CONTRIBUTING.md: Rename "master" to "main". X-Git-Tag: collectd-5.12.0~12^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=923999bdf282b51115eab3c7e6004b51caf4d32d;p=thirdparty%2Fcollectd.git docs/CONTRIBUTING.md: Rename "master" to "main". --- diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index ca0f40f1f..f7cc9e0e6 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -43,8 +43,8 @@ the mailing list have a tendency to fall through the cracks. this reports a failure, please investigate and fix the problem. We will at best do a very casual review for failing PRs. * *Don't rebase:* Rebasing your branch destroys the review history. If a - review takes a long time, we may ask you to rebase on a more recent - *master*, but please don't do that without being asked. + review takes a long time, we may ask you to rebase on a more recent commit + on the *main* branch, but please don't do that without being asked. * *types.db:* One of the most common mistakes made by new contributors is the addition of (many) new *types* in the file `src/types.db`. The majority of usecases can be met with one of the existing entries. If you plan to add new