Merge pull request #1233 from aollier/one_sentence_per_line

ben · web-flow · commit 2f34cbf018fe · 2019-03-29T07:45:26.000-07:00
One sentence per line
diff --git a/LICENSE.asc b/LICENSE.asc
@@ -1 +1,2 @@
-This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
+To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
diff --git a/book/02-git-basics/sections/tagging.asc b/book/02-git-basics/sections/tagging.asc
@@ -280,7 +280,8 @@ Previous HEAD position was 99ada87... Merge pull request #89 from schacon/append
 HEAD is now at df3f601... add atlas.json and cover image
 ----
 
-In ``detached HEAD'' state, if you make changes and then create a commit, the tag will stay the same, but your new commit won't belong to any branch and will be unreachable, except by the exact commit hash. Thus, if you need to make changes -- say you're fixing a bug on an older version, for instance -- you will generally want to create a branch:
+In ``detached HEAD'' state, if you make changes and then create a commit, the tag will stay the same, but your new commit won't belong to any branch and will be unreachable, except by the exact commit hash.
+Thus, if you need to make changes -- say you're fixing a bug on an older version, for instance -- you will generally want to create a branch:
 
 [source,console]
 ----
diff --git a/book/03-git-branching/sections/remote-branches.asc b/book/03-git-branching/sections/remote-branches.asc
@@ -146,7 +146,8 @@ Branch serverfix set up to track remote branch serverfix from origin.
 Switched to a new branch 'serverfix'
 ----
 
-In fact, this is so common that there's even a shortcut for that shortcut. If the branch name you're trying to checkout (a) doesn't exist and (b) exactly matches a name on only one remote, Git will create a tracking branch for you:
+In fact, this is so common that there's even a shortcut for that shortcut.
+If the branch name you're trying to checkout (a) doesn't exist and (b) exactly matches a name on only one remote, Git will create a tracking branch for you:
 
 [source,console]
 ----
diff --git a/book/05-distributed-git/sections/maintaining.asc b/book/05-distributed-git/sections/maintaining.asc
@@ -363,7 +363,8 @@ image::images/large-merges-2.png[Merging contributed topic branches into long-te
 When a topic branch has finally been merged into `master`, it's removed from the repository.
 The Git project also has a `maint` branch that is forked off from the last release to provide backported patches in case a maintenance release is required.
 Thus, when you clone the Git repository, you have four branches that you can check out to evaluate the project in different stages of development, depending on how cutting edge you want to be or how you want to contribute; and the maintainer has a structured workflow to help them vet new contributions.
-The Git project's workflow is specialized. To clearly understand this you could check out the https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt[Git Maintainer's guide].
+The Git project's workflow is specialized.
+To clearly understand this you could check out the https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt[Git Maintainer's guide].
 
 [[_rebase_cherry_pick]]
 ===== Rebasing and Cherry-Picking Workflows
diff --git a/book/06-github/sections/2-contributing.asc b/book/06-github/sections/2-contributing.asc
diff --git a/book/07-git-tools/sections/credentials.asc b/book/07-git-tools/sections/credentials.asc
@@ -168,7 +168,8 @@ Here's the full source code of our new credential helper:
 include::../git-credential-read-only[]
 --------
 
-<1> Here we parse the command-line options, allowing the user to specify the input file. The default is `~/.git-credentials`.
+<1> Here we parse the command-line options, allowing the user to specify the input file.
+    The default is `~/.git-credentials`.
 <2> This program only responds if the action is `get` and the backing-store file exists.
 <3> This loop reads from stdin until the first blank line is reached.
     The inputs are stored in the `known` hash for later reference.
diff --git a/book/07-git-tools/sections/revision-selection.asc b/book/07-git-tools/sections/revision-selection.asc
@@ -216,7 +216,8 @@ Date:   Thu Dec 11 15:08:43 2008 -0800
 .Escaping the caret on Windows
 ====
 
-On Windows in `cmd.exe`, `^` is a special character and needs to be treated differently. You can either double it or put the commit reference in quotes:
+On Windows in `cmd.exe`, `^` is a special character and needs to be treated differently.
+You can either double it or put the commit reference in quotes:
 
 [source,console]
 ----
diff --git a/book/07-git-tools/sections/submodules.asc b/book/07-git-tools/sections/submodules.asc
@@ -682,7 +682,9 @@ CONFLICT (submodule): Merge conflict in DbConnector
 Automatic merge failed; fix conflicts and then commit the result.
 ----
 
-What it's suggesting that you do is to update the index like you had run `git add`, which clears the conflict, then commit. You probably shouldn't do this though. You can just as easily go into the submodule directory, see what the difference is, fast-forward to this commit, test it properly, and then commit it.
+The suggested command Git is providing will update the index as though you had run `git add` (which clears the conflict), then commit.
+You probably shouldn't do this though.
+You can just as easily go into the submodule directory, see what the difference is, fast-forward to this commit, test it properly, and then commit it.
 
 [source,console]
 ----
diff --git a/book/A-git-in-other-environments/sections/powershell.asc b/book/A-git-in-other-environments/sections/powershell.asc
@@ -13,7 +13,9 @@ image::images/posh-git.png[PowerShell with Posh-git.]
 
 ==== Installation
 ===== Prerequisites (Windows only)
-Before you're able to run PowerShell scripts on your machine, you need to set your local ExecutionPolicy to RemoteSigned (Basically anything except Undefined and Restricted). If you choose AllSigned instead of RemoteSigned, also local scripts (your own) need to be digitally signed in order to be executed. With RemoteSigned, only Scripts having the "ZoneIdentifier" set to Internet (were downloaded from the web) need to be signed, others not.
+Before you're able to run PowerShell scripts on your machine, you need to set your local ExecutionPolicy to RemoteSigned (Basically anything except Undefined and Restricted).
+If you choose AllSigned instead of RemoteSigned, also local scripts (your own) need to be digitally signed in order to be executed.
+With RemoteSigned, only Scripts having the "ZoneIdentifier" set to Internet (were downloaded from the web) need to be signed, others not.
 If you're an administrator and want to set it for all Users on that machine, use "-Scope LocalMachine".
 If you're a normal user, without administrative rights, you can use "-Scope CurrentUser" to set it only for you.
 
@@ -47,8 +49,11 @@ Then you can go back and try again.
 This happens, because the modules that ship with Windows PowerShell are signed with a different publishment certificate.
 
 ===== Update PowerShell Prompt
-To include git information in your prompt, the posh-git module needs to be imported. To have posh-git imported every time PowerShell starts, execute the Add-PoshGitToProfile command which will add the import statement into you $profile script. This script is executed everytime you open a new PowerShell console.
-Keep in mind, that there are multiple $profile scripts. E. g. one for the console and a separate one for the ISE.
+To include git information in your prompt, the posh-git module needs to be imported.
+To have posh-git imported every time PowerShell starts, execute the Add-PoshGitToProfile command which will add the import statement into you $profile script.
+This script is executed everytime you open a new PowerShell console.
+Keep in mind, that there are multiple $profile scripts.
+E. g. one for the console and a separate one for the ISE.
 [source,powershell]
 -----
 > Import-Module posh-git
diff --git a/book/A-git-in-other-environments/sections/visualstudiocode.asc b/book/A-git-in-other-environments/sections/visualstudiocode.asc
@@ -1,6 +1,7 @@
 === Git in Visual Studio Code
 
-Visual Studio Code has git support built in. You will need to have git version 2.0.0 (or newer) installed.
+Visual Studio Code has git support built in.
+You will need to have git version 2.0.0 (or newer) installed.
 
 The main features are:
 
@@ -17,4 +18,4 @@ The main features are:
 * With a extension, you can also handle GitHub Pull Requests:
   https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github[]
 
-The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol[]
+The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol[]
diff --git a/book/B-embedding-git/sections/go-git.asc b/book/B-embedding-git/sections/go-git.asc
@@ -52,7 +52,8 @@ r, err := git.Clone(memory.NewStorage(), nil, &git.CloneOptions{
 })
 -----
 
-Pluggable storage provides many interesting options. For instance, https://github.com/src-d/go-git/tree/master/_examples/storage[] allows you to store references, objects, and configuration in an Aerospike database.
+Pluggable storage provides many interesting options.
+For instance, https://github.com/src-d/go-git/tree/master/_examples/storage[] allows you to store references, objects, and configuration in an Aerospike database.
 
 Another feature is a flexible filesystem abstraction.
 Using https://godoc.org/github.com/src-d/go-billy#Filesystem[] it is easy to store all the files in different way i.e by packing all of them to a single archive on disk or by keeping them all in-memory.
diff --git a/book/contributors.asc b/book/contributors.asc
@@ -1,7 +1,9 @@
 [preface]
 == Contributors
 
-Since this is an Open Source book, we have gotten several errata and content changes donated over the years. Here are all the people who have contributed to the English version of Pro Git as an open source project. Thank you everyone for helping make this a better book for everyone.
+Since this is an Open Source book, we have gotten several errata and content changes donated over the years.
+Here are all the people who have contributed to the English version of Pro Git as an open source project.
+Thank you everyone for helping make this a better book for everyone.
 
 [source,tabsize=8]
 ----
diff --git a/book/introduction.asc b/book/introduction.asc
@@ -1,69 +1,58 @@
 [preface]
 == Introduction
 
-You're about to spend several hours of your life reading about Git. Let's take a minute to explain
-what we have in store for you. Here is a quick summary of the ten chapters and three appendices of this book.
+You're about to spend several hours of your life reading about Git.
+Let's take a minute to explain what we have in store for you.
+Here is a quick summary of the ten chapters and three appendices of this book.
 
-In *Chapter 1*, we're going to cover Version Control Systems (VCSs) and Git basics -- no
-technical stuff, just what Git is, why it came about in a land full of VCSs, what sets it apart, and
-why so many people are using it. Then, we'll explain how to download Git and set it up for the
-first time if you don't already have it on your system.
+In *Chapter 1*, we're going to cover Version Control Systems (VCSs) and Git basics -- no technical stuff, just what Git is, why it came about in a land full of VCSs, what sets it apart, and why so many people are using it.
+Then, we'll explain how to download Git and set it up for the first time if you don't already have it on your system.
 
-In *Chapter 2*, we will go over basic Git usage -- how to use Git in the 80% of cases you'll
-encounter most often. After reading this chapter, you should be able to clone a repository, see
-what has happened in the history of the project, modify files, and contribute changes. If the book
-spontaneously combusts at this point, you should already be pretty useful wielding Git in the time
-it takes you to go pick up another copy.
+In *Chapter 2*, we will go over basic Git usage -- how to use Git in the 80% of cases you'll encounter most often.
+After reading this chapter, you should be able to clone a repository, see what has happened in the history of the project, modify files, and contribute changes.
+If the book spontaneously combusts at this point, you should already be pretty useful wielding Git in the time it takes you to go pick up another copy.
 
-*Chapter 3* is about the branching model in Git, often described as Git's killer feature. Here
-you'll learn what truly sets Git apart from the pack. When you're done, you may feel the need to
-spend a quiet moment pondering how you lived before Git branching was part of your life.
+*Chapter 3* is about the branching model in Git, often described as Git's killer feature.
+Here you'll learn what truly sets Git apart from the pack.
+When you're done, you may feel the need to spend a quiet moment pondering how you lived before Git branching was part of your life.
 
-*Chapter 4* will cover Git on the server. This chapter is for those of you who want to set up Git
-inside your organization or on your own personal server for collaboration. We will also explore
-various hosted options if you prefer to let someone else handle that for you.
+*Chapter 4* will cover Git on the server.
+This chapter is for those of you who want to set up Git inside your organization or on your own personal server for collaboration.
+We will also explore various hosted options if you prefer to let someone else handle that for you.
 
-*Chapter 5* will go over in full detail various distributed workflows and how to accomplish
-them with Git. When you are done with this chapter, you should be able to work expertly with
-multiple remote repositories, use Git over email and deftly juggle numerous remote branches
-and contributed patches.
+*Chapter 5* will go over in full detail various distributed workflows and how to accomplish them with Git.
+When you are done with this chapter, you should be able to work expertly with multiple remote repositories, use Git over email and deftly juggle numerous remote branches and contributed patches.
 
-*Chapter 6* covers the GitHub hosting service and tooling in depth. We cover signing up for and managing an account, creating and using Git repositories, common workflows to contribute to projects and to accept contributions to yours, GitHub's programmatic interface and lots of little tips to make your life easier in general.
+*Chapter 6* covers the GitHub hosting service and tooling in depth.
+We cover signing up for and managing an account, creating and using Git repositories, common workflows to contribute to projects and to accept contributions to yours, GitHub's programmatic interface and lots of little tips to make your life easier in general.
 
-*Chapter 7* is about advanced Git commands. Here you will learn about topics like mastering the scary 'reset' command, using binary
-search to identify bugs, editing history, revision selection in detail, and a lot more. This
-chapter will round out your knowledge of Git so that you are truly a master.
+*Chapter 7* is about advanced Git commands.
+Here you will learn about topics like mastering the scary 'reset' command, using binary search to identify bugs, editing history, revision selection in detail, and a lot more.
+This chapter will round out your knowledge of Git so that you are truly a master.
 
-*Chapter 8* is about configuring your custom Git environment. This includes setting up hook
-scripts to enforce or encourage customized policies and using environment configuration settings
-so you can work the way you want to. We will also cover building your own set of scripts to
-enforce a custom committing policy.
+*Chapter 8* is about configuring your custom Git environment.
+This includes setting up hook scripts to enforce or encourage customized policies and using environment configuration settings so you can work the way you want to.
+We will also cover building your own set of scripts to enforce a custom committing policy.
 
-*Chapter 9* deals with Git and other VCSs. This includes using Git in a Subversion (SVN) world
-and converting projects from other VCSs to Git. A lot of organizations still use SVN and are
-not about to change, but by this point you'll have learned the incredible power of Git -- and this
-chapter shows you how to cope if you still have to use a SVN server. We also cover how to
-import projects from several different systems in case you do convince everyone to make the
-plunge.
+*Chapter 9* deals with Git and other VCSs.
+This includes using Git in a Subversion (SVN) world and converting projects from other VCSs to Git.
+A lot of organizations still use SVN and are not about to change, but by this point you'll have learned the incredible power of Git -- and this chapter shows you how to cope if you still have to use a SVN server.
+We also cover how to import projects from several different systems in case you do convince everyone to make the plunge.
 
-*Chapter 10* delves into the murky yet beautiful depths of Git internals. Now that you know all
-about Git and can wield it with power and grace, you can move on to discuss how Git stores its objects,
-what the object model is, details of packfiles, server protocols, and more. Throughout the book,
-we will refer to sections of this chapter in case you feel like diving deep at that point;
-but if you are like us and want to dive into the technical details, you may want to read Chapter 10 first.
+*Chapter 10* delves into the murky yet beautiful depths of Git internals.
+Now that you know all about Git and can wield it with power and grace, you can move on to discuss how Git stores its objects,
+what the object model is, details of packfiles, server protocols, and more.
+Throughout the book, we will refer to sections of this chapter in case you feel like diving deep at that point; but if you are like us and want to dive into the technical details, you may want to read Chapter 10 first.
 We leave that up to you.
 
-In *Appendix A*, we look at a number of examples of using Git in various specific environments. We cover
-a number of different GUIs and IDE programming environments that you may want to use Git in and what
-is available for you. If you're interested in an overview of using Git in your shell, your IDE,
-or your text editor, take a look here.
+In *Appendix A*, we look at a number of examples of using Git in various specific environments.
+We cover a number of different GUIs and IDE programming environments that you may want to use Git in and what is available for you.
+If you're interested in an overview of using Git in your shell, your IDE, or your text editor, take a look here.
 
-In *Appendix B*, we explore scripting and extending Git through tools like libgit2 and JGit. If you're
-interested in writing complex and fast custom tools and need low-level Git access, this is where you can
-see what that landscape looks like.
+In *Appendix B*, we explore scripting and extending Git through tools like libgit2 and JGit.
+If you're interested in writing complex and fast custom tools and need low-level Git access, this is where you can see what that landscape looks like.
 
-Finally, in *Appendix C*, we go through all the major Git commands one at a time and review where in the book
-we covered them and what we did with them. If you want to know where in the book we used any specific Git
-command you can look that up here.
+Finally, in *Appendix C*, we go through all the major Git commands one at a time and review where in the book we covered them and what we did with them.
+If you want to know where in the book we used any specific Git command you can look that up here.
 
 Let's get started.
diff --git a/book/preface_ben.asc b/book/preface_ben.asc
@@ -1,8 +1,12 @@
 [preface]
 == Preface by Ben Straub
 
-The first edition of this book is what got me hooked on Git. This was my introduction to a style of making software that felt more natural than anything I had seen before. I had been a developer for several years by then, but this was the right turn that sent me down a much more interesting path than the one I was on.
+The first edition of this book is what got me hooked on Git.
+This was my introduction to a style of making software that felt more natural than anything I had seen before.
+I had been a developer for several years by then, but this was the right turn that sent me down a much more interesting path than the one I was on.
 
-Now, years later, I'm a contributor to a major Git implementation, I've worked for the largest Git hosting company, and I've traveled the world teaching people about Git. When Scott asked if I'd be interested in working on the second edition, I didn't even have to think.
+Now, years later, I'm a contributor to a major Git implementation, I've worked for the largest Git hosting company, and I've traveled the world teaching people about Git.
+When Scott asked if I'd be interested in working on the second edition, I didn't even have to think.
 
-It's been a great pleasure and privilege to work on this book. I hope it helps you as much as it did me.
+It's been a great pleasure and privilege to work on this book.
+I hope it helps you as much as it did me.
diff --git a/book/preface_schacon.asc b/book/preface_schacon.asc

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.`
	`1`	`+This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.`
	`2`	`+To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.`