Skip to content

Commit f27d0ce

Browse files
committed
Merge pull request #400 from crd/fix-console-blocks-in-09-git-and-other-scms
Fix console blocks in 09-git-and-other-scms
2 parents 27203b6 + cddbcd2 commit f27d0ce

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

book/09-git-and-other-scms/sections/client-hg.asc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ $ cp .hgignore .git/info/exclude
137137

138138
The `.git/info/exclude` file acts just like a `.gitignore`, but isn't included in commits.
139139

140-
141140
===== Workflow
142141

143142
Let's assume we've done some work and made some commits on the `master` branch, and you're ready to push it to the remote repository.

book/09-git-and-other-scms/sections/client-tfs.asc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ There are a couple of other considerations you'll want to keep in mind:
267267
Different git-tf clones of the same TFVC repository may have different commit SHA-1 hashes, which will cause no end of headaches.
268268
* If your team's workflow includes collaborating in Git and syncing periodically with TFVC, only connect to TFVC with one of the Git repositories.
269269

270-
271270
===== Workflow: `git-tfs`
272271

273272
Let's walk through the same scenario using git-tfs.
@@ -403,7 +402,6 @@ Creating a branch in TFVC means adding a changeset where that branch now exists,
403402
Note also that git-tfs *created* the `tfs/featureBee` remote branch, but `HEAD` is still pointing to `master`.
404403
If you want to work on the newly-minted branch, you'll want to base your new commits on the `1d54865` commit, perhaps by creating a topic branch from that commit.
405404

406-
407405
===== Git and TFS Summary
408406

409407
Git-tf and Git-tfs are both great tools for interfacing with a TFVC server.

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ end
7979

8080
Now that you have an integer representation of your commit, you need a date for the commit metadata.
8181
Because the date is expressed in the name of the directory, you'll parse it out.
82-
The next line in your `print_export` file is
82+
The next line in your `print_export` file is:
8383

8484
[source,ruby]
8585
----
8686
date = convert_dir_to_date(dir)
8787
----
8888

89-
where `convert_dir_to_date` is defined as
89+
where `convert_dir_to_date` is defined as:
9090

9191
[source,ruby]
9292
----
@@ -220,7 +220,6 @@ def convert_dir_to_mark(dir)
220220
($marks.index(dir)+1).to_s
221221
end
222222
223-
224223
def convert_dir_to_date(dir)
225224
if dir == 'current'
226225
return Time.now().to_i
@@ -259,7 +258,6 @@ def print_export(dir, last_mark)
259258
mark
260259
end
261260
262-
263261
# Loop through the directories
264262
last_mark = nil
265263
Dir.chdir(ARGV[0]) do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ You should also do a bit of post-import cleanup.
7272
For one thing, you should clean up the weird references that `git svn` set up.
7373
First you'll move the tags so they're actual tags rather than strange remote branches, and then you'll move the rest of the branches so they're local.
7474

75-
To move the tags to be proper Git tags, run
75+
To move the tags to be proper Git tags, run:
7676

7777
[source,console]
7878
----

0 commit comments

Comments
 (0)