Skip to content

Commit 0fbebb2

Browse files
committed
Merge pull request #405 from Lazar95/whitespace-errors
remove unneeded double whitespaces
2 parents f27d0ce + 3b01138 commit 0fbebb2

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ After a few seconds, you'll be taken to your new project page, with your own wri
3232
(((GitHub, Flow)))
3333
GitHub is designed around a particular collaboration workflow, centered on Pull Requests.
3434
This flow works whether you're collaborating with a tightly-knit team in a single shared repository, or a globally-distributed company or network of strangers contributing to a project through dozens of forks.
35-
It is centered on the <<_topic_branch>> workflow covered in <<_git_branching>>.
35+
It is centered on the <<_topic_branch>> workflow covered in <<_git_branching>>.
3636

3737
Here's how it generally works:
3838

book/07-git-tools/sections/advanced-merging.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ So how would we do that?
165165

166166
First, we get into the merge conflict state.
167167
Then we want to get copies of my version of the file, their version (from the branch we're merging in) and the common version (from where both sides branched off).
168-
Then we want to fix up either their side or our side and re-try the merge again for just this single file.
168+
Then we want to fix up either their side or our side and re-try the merge again for just this single file.
169169

170170
Getting the three file versions is actually pretty easy.
171171
Git stores all of these versions in the index under ``stages'' which each have numbers associated with them.
@@ -422,7 +422,7 @@ $ git log --oneline --left-right HEAD...MERGE_HEAD
422422
That's a nice list of the six total commits involved, as well as which line of development each commit was on.
423423

424424
We can further simplify this though to give us much more specific context.
425-
If we add the `--merge` option to `git log`, it will only show the commits in either side of the merge that touch a file that's currently conflicted.
425+
If we add the `--merge` option to `git log`, it will only show the commits in either side of the merge that touch a file that's currently conflicted.
426426

427427
[source,console]
428428
----

book/07-git-tools/sections/reset.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Like `reset`, `checkout` manipulates the three trees, and it is a bit different
269269
Running `git checkout [branch]` is pretty similar to running `git reset --hard [branch]` in that it updates all three trees for you to look like `[branch]`, but there are two important differences.
270270

271271
First, unlike `reset --hard`, `checkout` is working-directory safe; it will check to make sure it's not blowing away files that have changes to them.
272-
Actually, it's a bit smarter than that – it tries to do a trivial merge in the Working Directory, so all of the files you _haven't_ changed in will be updated.
272+
Actually, it's a bit smarter than that – it tries to do a trivial merge in the Working Directory, so all of the files you _haven't_ changed in will be updated.
273273
`reset --hard`, on the other hand, will simply replace everything across the board without checking.
274274

275275
The second important difference is how it updates HEAD.

book/07-git-tools/sections/signing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ a11bef0 N Scott Chacon first commit
157157

158158
Here we can see that only the latest commit is signed and valid and the previous commits are not.
159159

160-
In Git 1.8.3 and later, "git merge" and "git pull" can be told to inspect and reject when merging a commit that does not carry a trusted GPG signature with the `--verify-signatures` command.
160+
In Git 1.8.3 and later, "git merge" and "git pull" can be told to inspect and reject when merging a commit that does not carry a trusted GPG signature with the `--verify-signatures` command.
161161

162162
If you use this option when merging a branch and it contains commits that are not signed and valid, the merge will not work.
163163

book/10-git-internals/sections/refs.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Now, you can use the head reference you just created instead of the SHA-1 value
2727

2828
[source,console]
2929
----
30-
$ git log --pretty=oneline master
30+
$ git log --pretty=oneline master
3131
1a410efbd13591db07496601ebc7a059dd55cfe9 third commit
3232
cac0cab538b970a37ea1e769cbbde608743bc96d second commit
3333
fdf4fc3344e67ab068f836878b6c4951e3b15f3d first commit

book/C-git-commands/1-git-commands.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ We first introduce this in <<_getting_a_repo>>, where we show creating a brand n
5454

5555
We talk briefly about how you can change the default branch from ``master'' in <<_remote_branches>>.
5656

57-
We use this command to create an empty bare repository for a server in <<_bare_repo>>.
57+
We use this command to create an empty bare repository for a server in <<_bare_repo>>.
5858

5959
Finally, we go through some of the details of what it actually does behind the scenes in <<_plumbing_porcelain>>.
6060

@@ -194,7 +194,7 @@ Finally, we go through some of what it does in the background in <<_git_refs>>.
194194

195195
==== git checkout
196196

197-
The `git checkout` command is used to switch branches and check content out into your working directory.
197+
The `git checkout` command is used to switch branches and check content out into your working directory.
198198

199199
We first encounter the command in <<_switching_branches>> along with the `git branch` command.
200200

@@ -208,7 +208,7 @@ Finally, we go into some implementation detail in <<_the_head>>.
208208

209209
==== git merge
210210

211-
The `git merge` tool is used to merge one or more branches into the branch you have checked out.
211+
The `git merge` tool is used to merge one or more branches into the branch you have checked out.
212212
It will then advance the current branch to the result of the merge.
213213

214214
The `git merge` command was first introduced in <<_basic_branching>>.

0 commit comments

Comments
 (0)