Merge pull request #1855 from petk/patch-misc

ben · web-flow · commit 5ddb585ff740 · 2023-04-06T21:27:52.000-07:00
Fix whitespace
diff --git a/B-embedding-git-in-your-applications.asc b/B-embedding-git-in-your-applications.asc
@@ -17,4 +17,3 @@ include::book/B-embedding-git/sections/jgit.asc[]
 include::book/B-embedding-git/sections/go-git.asc[]
 
 include::book/B-embedding-git/sections/dulwich.asc[]
-
diff --git a/C-git-commands.asc b/C-git-commands.asc
@@ -86,7 +86,6 @@ While we're giving a rough overview of most of the more popular ones in this app
 
 We introduced the `git help` command in <<ch01-getting-started#_git_help>> and showed you how to use it to find more information about the `git shell` in <<ch04-git-on-the-server#_setting_up_server>>.
 
-
 === Getting and Creating Projects
 
 There are two ways to get a Git repository.
@@ -121,7 +120,6 @@ Finally, in <<ch07-git-tools#_cloning_submodules>> we learn the `--recurse-submo
 
 Though it's used in many other places through the book, these are the ones that are somewhat unique or where it is used in ways that are a little different.
 
-
 === Basic Snapshotting
 
 For the basic workflow of staging content and committing it to your history, there are only a few basic commands.
@@ -314,7 +312,6 @@ This command is introduced and covered in detail in <<ch02-git-basics-chapter#_g
 
 We also cover how to create a GPG signed tag with the `-s` flag and verify one with the `-v` flag in <<ch07-git-tools#_signing>>.
 
-
 === Sharing and Updating Projects
 
 There are not very many commands in Git that access the network, nearly all of the commands operate on the local database.
@@ -416,7 +413,6 @@ It's a way to get a description of a commit that is as unambiguous as a commit S
 
 We use `git describe` in <<ch05-distributed-git#_build_number>> and <<ch05-distributed-git#_preparing_release>> to get a string to name our release file after.
 
-
 === Debugging
 
 Git has a couple of commands that are used to help debug an issue in your code.
@@ -571,7 +567,6 @@ In <<ch07-git-tools#_removing_file_every_commit>> we explain the command and exp
 
 In <<ch09-git-and-other-systems#_git_p4>> we use it to fix up imported external repositories.
 
-
 === Plumbing Commands
 
 There were also quite a number of lower level plumbing commands that we encountered in the book.
diff --git a/book/01-introduction/sections/about-version-control.asc b/book/01-introduction/sections/about-version-control.asc
@@ -30,7 +30,7 @@ https://www.gnu.org/software/rcs/[RCS^] works by keeping patch sets (that is, th
 (((version control,centralized)))
 The next major issue that people encounter is that they need to collaborate with developers on other systems.
 To deal with this problem, Centralized Version Control Systems (CVCSs) were developed.
-These systems (such as CVS, Subversion, and Perforce) have a single server that contains all the versioned files, and a number of clients that check out files from that central place. (((CVS)))(((Subversion)))(((Perforce)))
+These systems (such as CVS, Subversion, and Perforce) have a single server that contains all the versioned files, and a number of clients that check out files from that central place.(((CVS)))(((Subversion)))(((Perforce)))
 For many years, this has been the standard for version control.
 
 .Centralized version control diagram
diff --git a/book/01-introduction/sections/help.asc b/book/01-introduction/sections/help.asc
@@ -47,4 +47,3 @@ usage: git add [<options>] [--] <pathspec>...
     --pathspec-from-file <file> read pathspec from file
     --pathspec-file-nul         with --pathspec-from-file, pathspec elements are separated with NUL character
 ----
-
diff --git a/book/01-introduction/sections/history.asc b/book/01-introduction/sections/history.asc
@@ -10,11 +10,11 @@ In 2005, the relationship between the community that developed the Linux kernel
 This prompted the Linux development community (and in particular Linus Torvalds, the creator of Linux) to develop their own tool based on some of the lessons they learned while using BitKeeper.(((Linus Torvalds)))
 Some of the goals of the new system were as follows:
 
-*  Speed
-*  Simple design
-*  Strong support for non-linear development (thousands of parallel branches)
-*  Fully distributed
-*  Able to handle large projects like the Linux kernel efficiently (speed and data size)
+* Speed
+* Simple design
+* Strong support for non-linear development (thousands of parallel branches)
+* Fully distributed
+* Able to handle large projects like the Linux kernel efficiently (speed and data size)
 
 Since its birth in 2005, Git has evolved and matured to be easy to use and yet retain these initial qualities.
 It's amazingly fast, it's very efficient with large projects, and it has an incredible branching system for non-linear development (see <<ch03-git-branching#ch03-git-branching>>).
diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc
@@ -228,11 +228,11 @@ Setting up a `.gitignore` file for your new repository before you get going is g
 
 The rules for the patterns you can put in the `.gitignore` file are as follows:
 
-*  Blank lines or lines starting with `#` are ignored.
-*  Standard glob patterns work, and will be applied recursively throughout the entire working tree.
-*  You can start patterns with a forward slash (`/`) to avoid recursivity.
-*  You can end patterns with a forward slash (`/`) to specify a directory.
-*  You can negate a pattern by starting it with an exclamation point (`!`).
+* Blank lines or lines starting with `#` are ignored.
+* Standard glob patterns work, and will be applied recursively throughout the entire working tree.
+* You can start patterns with a forward slash (`/`) to avoid recursivity.
+* You can end patterns with a forward slash (`/`) to specify a directory.
+* You can negate a pattern by starting it with an exclamation point (`!`).
 
 Glob patterns are like simplified regular expressions that shells use.
 An asterisk (`\*`) matches zero or more characters; `[abc]` matches any character inside the brackets (in this case a, b, or c); a question mark (`?`) matches a single character; and brackets enclosing characters separated by a hyphen (`[0-9]`) matches any character between them (in this case 0 through 9).
diff --git a/book/03-git-branching/sections/branch-management.asc b/book/03-git-branching/sections/branch-management.asc
@@ -64,7 +64,7 @@ If you really do want to delete the branch and lose that work, you can force it
 ====
 The options described above, `--merged` and `--no-merged` will, if not given a commit or branch name as an argument, show you what is, respectively, merged or not merged into your _current_ branch.
 
-You can always provide an additional argument to ask about the merge state with respect to some other branch without checking  that other branch out first, as in, what is not merged into the `master` branch?
+You can always provide an additional argument to ask about the merge state with respect to some other branch without checking that other branch out first, as in, what is not merged into the `master` branch?
 [source,console]
 ----
 $ git checkout testing
diff --git a/book/03-git-branching/sections/nutshell.asc b/book/03-git-branching/sections/nutshell.asc
@@ -204,6 +204,7 @@ It's typical to create a new branch and want to switch to that new branch at the
 From Git version 2.23 onwards you can use `git switch` instead of `git checkout` to:
 
 - Switch to an existing branch: `git switch testing-branch`.
-- Create a new branch and switch to it: `git switch -c new-branch`. The `-c` flag stands for create, you can also use the full flag: `--create`.
+- Create a new branch and switch to it: `git switch -c new-branch`.
+  The `-c` flag stands for create, you can also use the full flag: `--create`.
 - Return to your previously checked out branch: `git switch -`.
 ====
diff --git a/book/04-git-server/sections/protocols.asc b/book/04-git-server/sections/protocols.asc
@@ -198,9 +198,10 @@ It uses the same data-transfer mechanism as the SSH protocol but without the enc
 
 Due to the lack of TLS or other cryptography, cloning over `git://` might lead to an arbitrary code execution vulnerability, and should therefore be avoided unless you know what you are doing.
 
-* If you run `git clone git://example.com/project.git`, an attacker who controls e.g your router can modify the repo you just cloned, inserting malicious code into it. If you then compile/run the code you just cloned, you will execute the malicious code.
+* If you run `git clone git://example.com/project.git`, an attacker who controls e.g your router can modify the repo you just cloned, inserting malicious code into it.
+  If you then compile/run the code you just cloned, you will execute the malicious code.
   Running `git clone http://example.com/project.git` should be avoided for the same reason.
-*  Running `git clone https://example.com/project.git` does not suffer from the same problem (unless the attacker can provide a TLS certificate for example.com). 
+* Running `git clone https://example.com/project.git` does not suffer from the same problem (unless the attacker can provide a TLS certificate for example.com).
   Running `git clone git@example.com:project.git` only suffers from this problem if you accept a wrong ssh key fingerprint.
 
 It also has no authentication, i.e. anyone can clone the repo (although this is often exactly what you want).
diff --git a/book/06-github/sections/2-contributing.asc b/book/06-github/sections/2-contributing.asc
@@ -25,7 +25,6 @@ image::images/forkbutton.png[The “Fork” button]
 
 After a few seconds, you'll be taken to your new project page, with your own writeable copy of the code.
 
-
 [[ch06-github_flow]]
 ==== The GitHub Flow
 
@@ -339,7 +338,7 @@ Again, you can reference commits in forks or other repositories in the same way
 ==== GitHub Flavored Markdown
 
 Linking to other Issues is just the beginning of interesting things you can do with almost any text box on GitHub.
-In  Issue and Pull Request descriptions, comments, code comments and more, you can use what is called "`GitHub Flavored Markdown`".
+In Issue and Pull Request descriptions, comments, code comments and more, you can use what is called "`GitHub Flavored Markdown`".
 Markdown is like writing in plain text but which is rendered richly.
 
 See <<_example_markdown>> for an example of how comments or text can be written and then rendered using Markdown.
@@ -466,7 +465,6 @@ image::images/markdown-07-emoji.png[Heavy emoji commenting]
 
 Not that this is incredibly useful, but it does add an element of fun and emotion to a medium that is otherwise hard to convey emotion in.
 
-
 [NOTE]
 ====
 There are actually quite a number of web services that make use of emoji characters these days.
diff --git a/book/06-github/sections/3-maintaining.asc b/book/06-github/sections/3-maintaining.asc
@@ -218,7 +218,6 @@ The eagle-eyed among you would note the `head` on the end of the remote portion
 There's also a `refs/pull/#/merge` ref on the GitHub side, which represents the commit that would result if you push the "`merge`" button on the site.
 This can allow you to test the merge before even hitting the button.
 
-
 ===== Pull Requests on Pull Requests
 
 Not only can you open Pull Requests that target the main or `master` branch, you can actually open a Pull Request targeting any branch in the network.
diff --git a/book/06-github/sections/5-scripting.asc b/book/06-github/sections/5-scripting.asc
@@ -165,7 +165,6 @@ hs_err_pid*
 }
 ----
 
-
 ==== Commenting on an Issue
 
 However, if you want to do an action on the website such as comment on an Issue or Pull Request or if you want to view or interact with private content, you'll need to authenticate.
diff --git a/book/07-git-tools/sections/bundling.asc b/book/07-git-tools/sections/bundling.asc
@@ -80,7 +80,7 @@ b1ec324 First commit
 
 First we need to determine the range of commits we want to include in the bundle.
 Unlike the network protocols which figure out the minimum set of data to transfer over the network for us, we'll have to figure this out manually.
- Now, you could just do the same thing and bundle the entire repository, which will work, but it's better to just bundle up the difference - just the three commits we just made locally.
+Now, you could just do the same thing and bundle the entire repository, which will work, but it's better to just bundle up the difference - just the three commits we just made locally.
 
 In order to do that, you'll have to calculate the difference.
 As we described in <<ch07-git-tools#_commit_ranges>>, you can specify a range of commits in a number of ways.
diff --git a/book/07-git-tools/sections/credentials.asc b/book/07-git-tools/sections/credentials.asc
@@ -21,7 +21,8 @@ Git has a few options provided in the box:
   This method stores the credentials on disk, and they never expire, but they're encrypted with the same system that stores HTTPS certificates and Safari auto-fills.
 * If you're using Windows, you can enable the *Git Credential Manager* feature when installing https://gitforwindows.org/[Git for Windows] or separately install https://github.com/git-ecosystem/git-credential-manager/releases/latest[the latest GCM] as a standalone service.
   This is similar to the "`osxkeychain`" helper described above, but uses the Windows Credential Store to control sensitive information.
-  It can also serve credentials to WSL1 or WSL2. See https://github.com/git-ecosystem/git-credential-manager#readme[GCM Install Instructions] for more information.
+  It can also serve credentials to WSL1 or WSL2.
+  See https://github.com/git-ecosystem/git-credential-manager#readme[GCM Install Instructions] for more information.
 
 You can choose one of these methods by setting a Git configuration value:
 
diff --git a/book/07-git-tools/sections/submodules.asc b/book/07-git-tools/sections/submodules.asc
@@ -434,7 +434,7 @@ nothing to commit, working tree clean
 
 Note that to be on the safe side, you should run `git submodule update` with the `--init` flag in case the MainProject commits you just pulled added new submodules, and with the `--recursive` flag if any submodules have nested submodules.
 
-If you want to automate this process, you can add the `--recurse-submodules` flag to the `git pull` command (since Git 2.14).
+If you want to automate this process, you can add the `--recurse-submodules` flag to the `git pull` command (since Git 2.14).
 This will make Git run `git submodule update` right after the pull, putting the submodules in the correct state.
 Moreover, if you want to make Git always pull with `--recurse-submodules`, you can set the configuration option `submodule.recurse` to true (this works for `git pull` since Git 2.15).
 This option will make Git use the `--recurse-submodules` flag for all commands that support it (except `clone`).
diff --git a/book/08-customizing-git/sections/config.asc b/book/08-customizing-git/sections/config.asc
@@ -302,6 +302,7 @@ $ git config --global mergetool.extMerge.cmd \
 $ git config --global mergetool.extMerge.trustExitCode false
 $ git config --global diff.external extDiff
 ----
+
 or you can edit your `~/.gitconfig` file to add these lines:
 
 [source,ini]
diff --git a/book/09-git-and-other-scms/sections/client-hg.asc b/book/09-git-and-other-scms/sections/client-hg.asc
@@ -74,18 +74,18 @@ Let's take a look at what's actually in the `.git` directory:
 $ tree .git/refs
 .git/refs
 ├── heads
-│   └── master
+│   └── master
 ├── hg
-│   └── origin
-│       ├── bookmarks
-│       │   └── master
-│       └── branches
-│           └── default
+│   └── origin
+│       ├── bookmarks
+│       │   └── master
+│       └── branches
+│           └── default
 ├── notes
-│   └── hg
+│   └── hg
 ├── remotes
-│   └── origin
-│       └── HEAD
+│   └── origin
+│       └── HEAD
 └── tags
 
 9 directories, 5 files
@@ -390,7 +390,6 @@ o  0   0a04b987be5a   2005-08-26 01:20 -0700   mpm
 Changesets _8_, _9_, and _10_ have been created and belong to the `permanent` branch, but the old changesets are still there.
 This can be *very* confusing for your teammates who are using Mercurial, so try to avoid it.
 
-
 ===== Mercurial Summary
 
 Git and Mercurial are similar enough that working across the boundary is fairly painless.
diff --git a/book/09-git-and-other-scms/sections/client-p4.asc b/book/09-git-and-other-scms/sections/client-p4.asc
@@ -83,15 +83,15 @@ The file structure looks like this:
 $ tree
 .
 ├── objects
-│   ├── repos
-│   │   └── [...]
-│   └── trees
-│       └── [...]
+│   ├── repos
+│   │   └── [...]
+│   └── trees
+│       └── [...]
 │
 ├── p4gf_config
 ├── repos
-│   └── Talkhouse
-│       └── p4gf_config
+│   └── Talkhouse
+│       └── p4gf_config
 └── users
     └── p4gf_usermap
 
diff --git a/book/09-git-and-other-scms/sections/import-custom.asc b/book/09-git-and-other-scms/sections/import-custom.asc
@@ -204,7 +204,6 @@ $stdout.binmode
 That's it.
 Here's the script in its entirety:
 
-
 [source,ruby]
 ----
 #!/usr/bin/env ruby
diff --git a/book/10-git-internals/sections/environment.asc b/book/10-git-internals/sections/environment.asc
@@ -4,7 +4,6 @@ Git always runs inside a `bash` shell, and uses a number of shell environment va
 Occasionally, it comes in handy to know what these are, and how they can be used to make Git behave the way you want it to.
 This isn't an exhaustive list of all the environment variables Git pays attention to, but we'll cover the most useful.
 
-
 ==== Global Behavior
 
 Some of Git's general behavior as a computer program depends on environment variables.
@@ -27,7 +26,6 @@ If this is unset, `PAGER` will be used as a fallback.
 *`GIT_EDITOR`* is the editor Git will launch when the user needs to edit some text (a commit message, for example).
 If unset, `EDITOR` will be used.
 
-
 ==== Repository Locations
 
 Git uses several environment variables to determine how it interfaces with the current repository.
@@ -48,7 +46,6 @@ If `--git-dir` or `GIT_DIR` is specified but none of `--work-tree`, `GIT_WORK_TR
 *`GIT_ALTERNATE_OBJECT_DIRECTORIES`* is a colon-separated list (formatted like `/dir/one:/dir/two:…`) which tells Git where to check for objects if they aren't in `GIT_OBJECT_DIRECTORY`.
 If you happen to have a lot of projects with large files that have the exact same contents, this can be used to avoid storing too many copies of them.
 
-
 ==== Pathspecs
 
 A "`pathspec`" refers to how you specify paths to things in Git, including the use of wildcards.
@@ -62,7 +59,6 @@ You can override this in individual cases by starting the pathspec with `:(glob)
 
 *`GIT_ICASE_PATHSPECS`* sets all pathspecs to work in a case-insensitive manner.
 
-
 ==== Committing
 
 The final creation of a Git commit object is usually done by `git-commit-tree`, which uses these environment variables as its primary source of information, falling back to configuration values only if these aren't present.
@@ -82,7 +78,6 @@ The final creation of a Git commit object is usually done by `git-commit-tree`,
 *`EMAIL`* is the fallback email address in case the `user.email` configuration value isn't set.
 If _this_ isn't set, Git falls back to the system user and host names.
 
-
 ==== Networking
 
 Git uses the `curl` library to do network operations over HTTP, so *`GIT_CURL_VERBOSE`* tells Git to emit all the messages generated by that library.
@@ -91,14 +86,12 @@ This is similar to doing `curl -v` on the command line.
 *`GIT_SSL_NO_VERIFY`* tells Git not to verify SSL certificates.
 This can sometimes be necessary if you're using a self-signed certificate to serve Git repositories over HTTPS, or you're in the middle of setting up a Git server but haven't installed a full certificate yet.
 
-
 If the data rate of an HTTP operation is lower than *`GIT_HTTP_LOW_SPEED_LIMIT`* bytes per second for longer than *`GIT_HTTP_LOW_SPEED_TIME`* seconds, Git will abort that operation.
 These values override the `http.lowSpeedLimit` and `http.lowSpeedTime` configuration values.
 
 *`GIT_HTTP_USER_AGENT`* sets the user-agent string used by Git when communicating over HTTP.
 The default is a value like `git/2.0.0`.
 
-
 ==== Diffing and Merging
 
 *`GIT_DIFF_OPTS`* is a bit of a misnomer.
diff --git a/book/10-git-internals/sections/objects.asc b/book/10-git-internals/sections/objects.asc
@@ -257,7 +257,6 @@ $ echo 'First commit' | git commit-tree d8329f
 fdf4fc3344e67ab068f836878b6c4951e3b15f3d
 ----
 
-
 [NOTE]
 ====
 You will get a different hash value because of different creation time and author data.
@@ -366,7 +365,7 @@ $ irb
 ----
 
 Git first constructs a header which starts by identifying the type of object -- in this case, a blob.
-To that first part of the header, Git adds a space followed by the size in bytes  of the content, and adding a final null byte:
+To that first part of the header, Git adds a space followed by the size in bytes of the content, and adding a final null byte:
 
 [source,console]
 ----
diff --git a/book/A-git-in-other-environments/sections/guis.asc b/book/A-git-in-other-environments/sections/guis.asc
@@ -144,7 +144,6 @@ These tools are very well-suited for the workflow they're designed for.
 Developers and non-developers alike can be collaborating on a project within minutes, and many of the best practices for this kind of workflow are baked into the tools.
 However, if your workflow is different, or you want more control over how and when network operations are done, we recommend you use another client or the command line.
 
-
 ==== Other GUIs
 
 There are a number of other graphical Git clients, and they run the gamut from specialized, single-purpose tools all the way to apps that try to expose everything Git can do.
diff --git a/book/A-git-in-other-environments/sections/powershell.asc b/book/A-git-in-other-environments/sections/powershell.asc
@@ -61,7 +61,7 @@ To include git information in your prompt, the posh-git module needs to be impor
 To have posh-git imported every time PowerShell starts, execute the `Add-PoshGitToProfile` command which will add the import statement into your `$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.
+E.g. one for the console and a separate one for the ISE.
 
 [source,powershell]
 ----
diff --git a/book/A-git-in-other-environments/sections/sublimetext.asc b/book/A-git-in-other-environments/sections/sublimetext.asc
diff --git a/book/B-embedding-git/sections/dulwich.asc b/book/B-embedding-git/sections/dulwich.asc
diff --git a/book/contributors.asc b/book/contributors.asc
diff --git a/book/preface_schacon.asc b/book/preface_schacon.asc

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,3 @@ include::book/B-embedding-git/sections/jgit.asc[]`
`17`	`17`	`include::book/B-embedding-git/sections/go-git.asc[]`
`18`	`18`
`19`	`19`	`include::book/B-embedding-git/sections/dulwich.asc[]`
`20`		`-`