Merge branch 'master' into bugfix/issue-351

Author: HonkingGoose

.github/pull_request_template.md

@@ -0,0 +1,23 @@
+<!-- Thanks for contributing! -->
+<!-- Before you start on a large rewrite or other major change: open a new issue first, to discuss the proposed changes. -->
+<!-- Should your changes appear in a printed edition, you'll be included in the contributors list. -->
+
+<!-- Mark the checkbox [X] or [x] if you agree with the item. -->
+- [ ] I provide my work under the [project license](https://github.com/progit/progit2/blob/master/LICENSE.asc).
+- [ ] I grant such license of my work as is required for the purposes of future print editions to [Ben Straub](https://github.com/ben) and [Scott Chacon](https://github.com/schacon).
+
+## Changes
+
+- 
+
+## Context
+<!--
+List related issues.
+Provide the necessary context to understand the changes you made.
+
+Are you fixing a issue with this pull-request?
+Use the "Fixes" keyword, to close the issue automatically after your work is merged.
+
+Fixes #123
+Fixes #456
+-->

C-git-commands.asc

@@ -568,7 +568,7 @@ The `git filter-branch` command is used to rewrite loads of commits according to
 
 In <<ch07-git-tools#_removing_file_every_commit>> we explain the command and explore several different options such as `--commit-filter`, `--subdirectory-filter` and `--tree-filter`.
 
-In <<ch09-git-and-other-systems#_git_p4>> and <<ch09-git-and-other-systems#_git_tfs>> we use it to fix up imported external repositories.
+In <<ch09-git-and-other-systems#_git_p4>> we use it to fix up imported external repositories.
 
 
 === Plumbing Commands

CONTRIBUTING.md

@@ -1,44 +1,44 @@
 # Contributing to Pro Git (2nd Edition)
 
-## Licensing
+## Licensing your work to us
 
-By opening a pull request to this repository, you agree to provide your work under the [project license](LICENSE.asc).
+When you open a pull request, you agree to provide your work under the [project license](LICENSE.asc).
 Also, you agree to grant such license of your work as is required for the purposes of future print editions to @ben and @schacon.
 Should your changes appear in a printed edition, you'll be included in the [contributors list](book/contributors.asc).
 
 ## Signaling an Issue
 
-Before signaling an issue, please check that there isn't already a similar one in the bug tracking system.
+Search for similar issues, before creating a new issue.
 
-Also, if this issue has been spotted on the git-scm.com site, please cross-check that it is still present in the pdf version.
-The issue may have already been corrected, but the changes have not been deployed yet.
+Also, if this issue has been spotted on the git-scm.com site, cross-check that the issue is present in the pdf version.
+The issue may have already been corrected in the source files, but not yet deployed to the git-scm.com site.
 
 ## Small Corrections
 
 Errata and basic clarifications will be accepted if we agree that they improve the content.
-You can also open an issue so we can figure out how or if it needs to be addressed.
+You can also open an issue so that we can discuss how or if the issue needs to be addressed.
 
 If you've never done this before, the [flow guide](https://guides.github.com/introduction/flow/) might be useful.
 
 ## Large Rewrites
 
 Open an issue for discussion before you start.
-These changes tend to be very subjective, often only clarifying things for some small percentage of people and it's rarely worth the time to accept them.
-Professional copy editors have already reviewed this content multiple times so while you may have somewhat better taste and grammar than we do it's unlikely that your prose is going to be *so* much better that it's worth changing vast swaths of text.
+A large rewrite tends to be very subjective, often only clarifying things for a small amount of readers.
+Professional copy editors have already reviewed this content multiple times.
+It's unlikely that your prose is going to be *so* much better that it's worth changing large portions of text.
 
 ## Figures
 
-The images in this book were generated using [Sketch 3](https://www.sketchapp.com/), with the [included sketchbook file](diagram-source/progit.sketch).
+The images in this book are generated using [Sketch 3](https://www.sketchapp.com/), with the [included sketchbook file](diagram-source/progit.sketch).
 
-To add a figure:
+To create a figure:
 
 1. Add a page to the sketchbook.
-Try to use the included symbols wherever possible.
+Use the included symbols wherever possible.
 2. Add a "slice" to your page.
-Give it a name that matches the destination PNG filename, relative from the root of the source directory.
-3. Make sure your slice is set to export at "800w".
-
+Name the slice so that it matches the destination PNG filename, relative from the root of the source directory.
+3. Set your slice to export at "800w".
 
 ## Translations
 
-If you would like to contribute to translating Pro Git into your language, take a look at [TRANSLATING.md](TRANSLATING.md).
+If you want to contribute to translating Pro Git into your language, take a look at [TRANSLATING.md](TRANSLATING.md).

book/01-introduction/sections/first-time-setup.asc

@@ -8,7 +8,7 @@ You can also change them at any time by running through the commands again.
 Git comes with a tool called `git config` that lets you get and set configuration variables that control all aspects of how Git looks and operates.(((git commands, config)))
 These variables can be stored in three different places:
 
-1. `/etc/gitconfig` file: Contains values applied to every user on the system and all their repositories.
+1. `[path]/etc/gitconfig` file: Contains values applied to every user on the system and all their repositories.
   If you pass the option `--system` to `git config`, it reads and writes from this file specifically.
   Because this is a system configuration file, you would need administrative or superuser privilege to make changes to it.
 2. `~/.gitconfig` or `~/.config/git/config` file: Values specific personally to you, the user.
@@ -17,10 +17,10 @@ These variables can be stored in three different places:
   You can force Git to read from and write to this file with the `--local` option, but that is in fact the default.
   Unsurprisingly, you need to be located somewhere in a Git repository for this option to work properly.
 
-Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`.
+Each level overrides values in the previous level, so values in `.git/config` trump those in `[path]/etc/gitconfig`.
 
 On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Users\$USER` for most people).
-It also still looks for `/etc/gitconfig`, although it's relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer.
+It also still looks for `[path]/etc/gitconfig`, although it's relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer.
 If you are using version 2.x or later of Git for Windows, there is also a system-level config file at
 `C:\Documents and Settings\All Users\Application Data\Git\config` on Windows XP, and in `C:\ProgramData\Git\config` on Windows Vista and newer.
 This config file can only be changed by `git config -f <file>` as an admin.
@@ -84,6 +84,18 @@ 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.
 ====
 
+==== Your default branch name
+
+By default Git will create a branch called _master_ when you create a new repository with `git init`.
+From Git version 2.28 onwards, you can set a different name for the initial branch.
+
+To set _main_ as the default branch name do:
+
+[source,console]
+----
+$ git config --global init.defaultBranch main
+----
+
 ==== Checking Your Settings
 
 If you want to check your configuration settings, you can use the `git config --list` command to list all the settings Git can find at that point:
@@ -100,7 +112,7 @@ color.diff=auto
 ...
 ----
 
-You may see keys more than once, because Git reads the same key from different files (`/etc/gitconfig` and `~/.gitconfig`, for example).
+You may see keys more than once, because Git reads the same key from different files (`[path]/etc/gitconfig` and `~/.gitconfig`, for example).
 In this case, Git uses the last value for each unique key it sees.
 
 You can also check what Git thinks a specific key's value is by typing `git config <key>`:(((git commands, config)))

book/08-customizing-git/sections/config.asc

@@ -14,7 +14,7 @@ $ git config --global user.email [email protected]
 Now you'll learn a few of the more interesting options that you can set in this manner to customize your Git usage.
 
 First, a quick review: Git uses a series of configuration files to determine non-default behavior that you may want.
-The first place Git looks for these values is in the system-wide `/etc/gitconfig` file, which contains settings that are applied to every user on the system and all of their repositories.
+The first place Git looks for these values is in the system-wide `[path]/etc/gitconfig` file, which contains settings that are applied to every user on the system and all of their repositories.
 If you pass the option `--system` to `git config`, it reads and writes from this file specifically.
 
 The next place Git looks is the `~/.gitconfig` (or `~/.config/git/config`) file, which is specific to each user.
@@ -24,7 +24,7 @@ Finally, Git looks for configuration values in the configuration file in the Git
 These values are specific to that single repository, and represent passing the `--local` option to `git config`.
 If you don't specify which level you want to work with, this is the default.
 
-Each of these ``levels'' (system, global, local) overwrites values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`, for instance.
+Each of these ``levels'' (system, global, local) overwrites values in the previous level, so values in `.git/config` trump those in `[path]/etc/gitconfig`, for instance.
 
 [NOTE]
 ====