Skip to content

Commit 103f7a1

Browse files
replace "master" with "main"
As "main" has become the preferred term for the name of that branch, this document should reflect that as well. The various independent translations should follow the same practice.
1 parent f4e01dc commit 103f7a1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ request.
6868
Use the following naming convention:
6969

7070
```shell
71-
$ git checkout -b feature-a/master # team-wide branch
71+
$ git checkout -b feature-a/main # team-wide branch
7272
$ git checkout -b feature-a/maria # Maria's personal branch
7373
$ git checkout -b feature-a/nick # Nick's personal branch
7474
```
7575

7676
Merge at will the personal branches to the team-wide branch (see ["Merging"](#merging)).
77-
Eventually, the team-wide branch will be merged to "master".
77+
Eventually, the team-wide branch will be merged to "main".
7878

7979
* Delete your branch from the upstream repository after it's merged, unless
8080
there is a specific reason not to.
8181

82-
Tip: Use the following command while being on "master", to list merged
82+
Tip: Use the following command while being on "main", to list merged
8383
branches:
8484

8585
```shell
@@ -209,9 +209,9 @@ holds true that you should apply all of the above *before* pushing it.
209209
* You are the only one working on the branch and it is not being reviewed.
210210

211211
* You want to tidy up your branch (eg. squash commits) and/or rebase it onto
212-
the "master" in order to merge it later.
212+
the "main" in order to merge it later.
213213

214-
That said, *never rewrite the history of the "master" branch* or any other
214+
That said, *never rewrite the history of the "main" branch* or any other
215215
special branches (ie. used by production or CI servers).
216216

217217
* Keep the history *clean* and *simple*. *Just before you merge* your branch:
@@ -223,16 +223,16 @@ holds true that you should apply all of the above *before* pushing it.
223223

224224
```shell
225225
[my-branch] $ git fetch
226-
[my-branch] $ git rebase origin/master
226+
[my-branch] $ git rebase origin/main
227227
# then merge
228228
```
229229

230230
This results in a branch that can be applied directly to the end of the
231-
"master" branch and results in a very simple history.
231+
"main" branch and results in a very simple history.
232232

233233
*(Note: This strategy is better suited for projects with short-running
234234
branches. Otherwise it might be better to occassionally merge the
235-
"master" branch instead of rebasing onto it.)*
235+
"main" branch instead of rebasing onto it.)*
236236

237237
* If your branch includes more than one commit, do not merge with a
238238
fast-forward:

0 commit comments

Comments
 (0)