Skip to content

Commit 22d79cc

Browse files
committed
Fix whitespace
- One sentence per line. - List indentation synced. - Normal space compared to character U+00a0 is similar but more common. - Some doubled new lines synced and removed. - Few double whitespaces synced.
1 parent 1551a5c commit 22d79cc

File tree

27 files changed

+42
-62
lines changed

27 files changed

+42
-62
lines changed

B-embedding-git-in-your-applications.asc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ include::book/B-embedding-git/sections/jgit.asc[]
1717
include::book/B-embedding-git/sections/go-git.asc[]
1818

1919
include::book/B-embedding-git/sections/dulwich.asc[]
20-

C-git-commands.asc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ While we're giving a rough overview of most of the more popular ones in this app
8686

8787
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>>.
8888

89-
9089
=== Getting and Creating Projects
9190

9291
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
121120

122121
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.
123122

124-
125123
=== Basic Snapshotting
126124

127125
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
314312

315313
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>>.
316314

317-
318315
=== Sharing and Updating Projects
319316

320317
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
416413

417414
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.
418415

419-
420416
=== Debugging
421417

422418
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
571567

572568
In <<ch09-git-and-other-systems#_git_p4>> we use it to fix up imported external repositories.
573569

574-
575570
=== Plumbing Commands
576571

577572
There were also quite a number of lower level plumbing commands that we encountered in the book.

book/01-introduction/sections/about-version-control.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ https://www.gnu.org/software/rcs/[RCS^] works by keeping patch sets (that is, th
3030
(((version control,centralized)))
3131
The next major issue that people encounter is that they need to collaborate with developers on other systems.
3232
To deal with this problem, Centralized Version Control Systems (CVCSs) were developed.
33-
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)))
33+
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)))
3434
For many years, this has been the standard for version control.
3535

3636
.Centralized version control diagram

book/01-introduction/sections/help.asc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,3 @@ usage: git add [<options>] [--] <pathspec>...
4747
--pathspec-from-file <file> read pathspec from file
4848
--pathspec-file-nul with --pathspec-from-file, pathspec elements are separated with NUL character
4949
----
50-

book/01-introduction/sections/history.asc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ In 2005, the relationship between the community that developed the Linux kernel
1010
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)))
1111
Some of the goals of the new system were as follows:
1212

13-
* Speed
14-
* Simple design
15-
* Strong support for non-linear development (thousands of parallel branches)
16-
* Fully distributed
17-
* Able to handle large projects like the Linux kernel efficiently (speed and data size)
13+
* Speed
14+
* Simple design
15+
* Strong support for non-linear development (thousands of parallel branches)
16+
* Fully distributed
17+
* Able to handle large projects like the Linux kernel efficiently (speed and data size)
1818
1919
Since its birth in 2005, Git has evolved and matured to be easy to use and yet retain these initial qualities.
2020
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>>).

book/02-git-basics/sections/recording-changes.asc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,11 @@ Setting up a `.gitignore` file for your new repository before you get going is g
228228

229229
The rules for the patterns you can put in the `.gitignore` file are as follows:
230230

231-
* Blank lines or lines starting with `#` are ignored.
232-
* Standard glob patterns work, and will be applied recursively throughout the entire working tree.
233-
* You can start patterns with a forward slash (`/`) to avoid recursivity.
234-
* You can end patterns with a forward slash (`/`) to specify a directory.
235-
* You can negate a pattern by starting it with an exclamation point (`!`).
231+
* Blank lines or lines starting with `#` are ignored.
232+
* Standard glob patterns work, and will be applied recursively throughout the entire working tree.
233+
* You can start patterns with a forward slash (`/`) to avoid recursivity.
234+
* You can end patterns with a forward slash (`/`) to specify a directory.
235+
* You can negate a pattern by starting it with an exclamation point (`!`).
236236

237237
Glob patterns are like simplified regular expressions that shells use.
238238
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).

book/03-git-branching/sections/branch-management.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ If you really do want to delete the branch and lose that work, you can force it
6464
====
6565
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.
6666
67-
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?
67+
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?
6868
[source,console]
6969
----
7070
$ git checkout testing

book/03-git-branching/sections/nutshell.asc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ It's typical to create a new branch and want to switch to that new branch at the
204204
From Git version 2.23 onwards you can use `git switch` instead of `git checkout` to:
205205
206206
- Switch to an existing branch: `git switch testing-branch`.
207-
- 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`.
207+
- Create a new branch and switch to it: `git switch -c new-branch`.
208+
The `-c` flag stands for create, you can also use the full flag: `--create`.
208209
- Return to your previously checked out branch: `git switch -`.
209210
====

book/04-git-server/sections/protocols.asc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,10 @@ It uses the same data-transfer mechanism as the SSH protocol but without the enc
198198

199199
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.
200200

201-
* 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.
201+
* 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.
202+
If you then compile/run the code you just cloned, you will execute the malicious code.
202203
Running `git clone http://example.com/project.git` should be avoided for the same reason.
203-
* 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).
204+
* 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).
204205
Running `git clone [email protected]:project.git` only suffers from this problem if you accept a wrong ssh key fingerprint.
205206

206207
It also has no authentication, i.e. anyone can clone the repo (although this is often exactly what you want).

book/06-github/sections/2-contributing.asc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ image::images/forkbutton.png[The “Fork” button]
2525

2626
After a few seconds, you'll be taken to your new project page, with your own writeable copy of the code.
2727

28-
2928
[[ch06-github_flow]]
3029
==== The GitHub Flow
3130

@@ -339,7 +338,7 @@ Again, you can reference commits in forks or other repositories in the same way
339338
==== GitHub Flavored Markdown
340339

341340
Linking to other Issues is just the beginning of interesting things you can do with almost any text box on GitHub.
342-
In Issue and Pull Request descriptions, comments, code comments and more, you can use what is called "`GitHub Flavored Markdown`".
341+
In Issue and Pull Request descriptions, comments, code comments and more, you can use what is called "`GitHub Flavored Markdown`".
343342
Markdown is like writing in plain text but which is rendered richly.
344343

345344
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]
466465

467466
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.
468467

469-
470468
[NOTE]
471469
====
472470
There are actually quite a number of web services that make use of emoji characters these days.

0 commit comments

Comments
 (0)