Skip to content

Commit

Permalink
Merge pull request #1810 from rahrah/anchor_id_clash
Browse files Browse the repository at this point in the history
Fix clash with named anchor ID
  • Loading branch information
ben authored Nov 26, 2022
2 parents 7275372 + 6f02954 commit 3bd83d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion book/01-introduction/sections/first-time-setup.asc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ You may find, if you don't setup your editor like this, you get into a really co
An example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit.
====

[[_default_branch]]
[[_new_default_branch]]
==== Your default branch name

By default Git will create a branch called _master_ when you create a new repository with `git init`.
Expand Down
2 changes: 1 addition & 1 deletion book/02-git-basics/sections/recording-changes.asc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ For now, that branch is always `master`, which is the default; you won't worry a
====
GitHub changed the default branch name from `master` to `main` in mid-2020, and other Git hosts followed suit.
So you may find that the default branch name in some newly created repositories is `main` and not `master`.
In addition, the default branch name can be changed (as you have seen in <<ch01-getting-started#_default_branch>>), so you may see a different name for the default branch.
In addition, the default branch name can be changed (as you have seen in <<ch01-getting-started#_new_default_branch>>), so you may see a different name for the default branch.
However, Git itself still uses `master` as the default, so we will use it throughout the book.
====
Expand Down

0 comments on commit 3bd83d2

Please sign in to comment.