Merge branch 'master' into feature/add-section-change-existing-branch-name

Author: ben

.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