Skip to content

Commit 913da01

Browse files
committed
Several small quotes fixes
1 parent a8237b1 commit 913da01

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

book/05-distributed-git/sections/contributing.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ Each developer has committed a few times and merged each other's work successful
302302
image::images/small-team-7.png[Jessica's history after pushing all changes back to the server.]
303303

304304
That is one of the simplest workflows.
305-
You work for a while, generally in a topic branch, and merge into your master branch when it's ready to be integrated.
306-
When you want to share that work, you fetch and merge your master from `origin/master` if it has changed, and finally push to the `master` branch on the server.
305+
You work for a while, generally in a topic branch, and merge into your `master` branch when it's ready to be integrated.
306+
When you want to share that work, you fetch and merge your `master` from `origin/master` if it has changed, and finally push to the `master` branch on the server.
307307
The general sequence is something like this:
308308

309309
.General sequence of events for a simple multiple-developer Git workflow.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ $ rm -Rf .git/refs/remotes/origin
9191
----
9292

9393
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.
94+
This is actually a Subversion feature called ``peg-revisions'', which is something that Git simply has no syntactical counterpart for.
9595
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.
9696
If you do not care anymore about the peg-revisions, simply remove them using `git branch -d`.
9797

0 commit comments

Comments
 (0)