Skip to content

Commit a8237b1

Browse files
committed
Fixes of new lines
1 parent e95aba0 commit a8237b1

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

README.asc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ This uses the `asciidoctor`, `asciidoctor-pdf` and `asciidoctor-epub` projects.
4444

4545
Before signaling an issue, please check that there isn't already a similar one in the bug tracking system.
4646

47-
Also, if this issue has been spotted on the git-scm.com site, please cross-check that it is still present in the pdf version. The issue may have already been corrected, but the changes have not been deployed yet.
47+
Also, if this issue has been spotted on the git-scm.com site, please cross-check that it is still present in the pdf version.
48+
The issue may have already been corrected, but the changes have not been deployed yet.
4849

4950
== Contributing
5051

book/06-github/sections/5-scripting.asc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ For more information on how to write webhooks and all the different event types
112112
==== The GitHub API
113113

114114
(((GitHub, API)))
115-
Services and hooks give you a way to receive push notifications about events that happen on your repositories, but what if you need more information about these events? What if you need to automate something like adding collaborators or labeling issues?
115+
Services and hooks give you a way to receive push notifications about events that happen on your repositories, but what if you need more information about these events?
116+
What if you need to automate something like adding collaborators or labeling issues?
116117

117118
This is where the GitHub API comes in handy.
118119
GitHub has tons of API endpoints for doing nearly anything you can do on the website in an automated fashion.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,8 @@ So now let's go through an example of making changes to the submodule at the sam
374374

375375
So far, when we've run the `git submodule update` command to fetch changes from the submodule repositories, Git would get the changes and update the files in the subdirectory but will leave the sub-repository in what's called a ``detached HEAD'' state.
376376
This means that there is no local working branch (like ``master'', for example) tracking changes.
377-
With no working branch tracking changes, that means even if you commit changes to the submodule, those changes will quite possibly be lost the next time you run `git submodule update`. You have to do some extra steps if you want changes in a submodule to be tracked.
377+
With no working branch tracking changes, that means even if you commit changes to the submodule, those changes will quite possibly be lost the next time you run `git submodule update`.
378+
You have to do some extra steps if you want changes in a submodule to be tracked.
378379

379380
In order to set up your submodule to be easier to go in and hack on, you need do two things.
380381
You need to go into each submodule and check out a branch to work on.

book/08-customizing-git/sections/policy.asc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ On the ACL file you looked at earlier, this `get_acl_access_data` method returns
167167

168168
Now that you have the permissions sorted out, you need to determine what paths the commits being pushed have modified, so you can make sure the user who's pushing has access to all of them.
169169

170-
You can pretty easily see what files have been modified in a single commit with the `--name-only` option to the `git log` command
171-
(mentioned briefly in <<_git_basics_chapter>>):
170+
You can pretty easily see what files have been modified in a single commit with the `--name-only` option to the `git log` command (mentioned briefly in <<_git_basics_chapter>>):
172171

173172
[source,console]
174173
----
@@ -428,7 +427,9 @@ target_shas.each do |sha|
428427
end
429428
end
430429
----
431-
This script uses a syntax that wasn't covered in <<_revision_selection>>. You get a list of commits that have already been pushed up by running this:
430+
431+
This script uses a syntax that wasn't covered in <<_revision_selection>>.
432+
You get a list of commits that have already been pushed up by running this:
432433

433434
[source,ruby]
434435
----

book/09-git-and-other-scms/sections/import-svn.asc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,16 @@ $ cp -Rf .git/refs/remotes/origin/* .git/refs/heads/
9090
$ rm -Rf .git/refs/remotes/origin
9191
----
9292

93-
It may happen that you'll see some extra branches which are suffixed by `@xxx` (where xxx is a number), while in Subversion you only see one branch. This is actually a Subversion feature called "peg-revisions", which is something that Git simply has no syntactical counterpart for. Hence, `git svn` simply adds the svn version number to the branch name just in the same way as you would have written it in svn to address the peg-revision of that branch. If you do not care anymore about the peg-revisions, simply remove them using `git branch -d`.
93+
It may happen that you'll see some extra branches which are suffixed by `@xxx` (where xxx is a number), while in Subversion you only see one branch.
94+
This is actually a Subversion feature called "peg-revisions", which is something that Git simply has no syntactical counterpart for.
95+
Hence, `git svn` simply adds the svn version number to the branch name just in the same way as you would have written it in svn to address the peg-revision of that branch.
96+
If you do not care anymore about the peg-revisions, simply remove them using `git branch -d`.
9497

9598
Now all the old branches are real Git branches and all the old tags are real Git tags.
9699

97-
There's one last thing to clean up. Unfortunately, `git svn` creates an extra branch named `trunk`, which maps to Subversion's default branch, but the `trunk` ref points to the same place as `master`. Since `master` is more idiomatically Git, here's how to remove the extra branch:
100+
There's one last thing to clean up.
101+
Unfortunately, `git svn` creates an extra branch named `trunk`, which maps to Subversion's default branch, but the `trunk` ref points to the same place as `master`.
102+
Since `master` is more idiomatically Git, here's how to remove the extra branch:
98103

99104
[source,console]
100105
----

0 commit comments

Comments
 (0)