Skip to content

Commit 84c6374

Browse files
author
Matthew McCullough
committed
Merge pull request #54 from randomecho/para-p-da-wrapper-tag
Pair up dangling paragraph tags; Make sure all text at least in P
2 parents eecddb9 + 4853299 commit 84c6374

File tree

7 files changed

+25
-12
lines changed

7 files changed

+25
-12
lines changed

branching/index.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ <h4>
9595

9696
<p>So let's start by creating a new branch and switching to it. You can do
9797
that by running <code>git branch (branchname)</code>.
98+
</p>
9899

99100
<pre>
100101
$ git branch testing
@@ -306,7 +307,7 @@ <h4>
306307
revert to what it was before I switched branches. Here I can change
307308
something different (in this case the printed output) and at the same
308309
time rename the file from <code>hello.rb</code> to <code>ruby.rb</code>.
309-
</b>
310+
</p>
310311

311312
<pre>
312313
<b>$ git checkout master</b>
@@ -372,7 +373,7 @@ <h4>
372373
of code is edited in different branches there is no way for a computer
373374
to figure it out, so it's up to us. Let's see another example of changing
374375
the same line in two branches.
375-
<p>
376+
</p>
376377

377378
<pre>
378379
<b>$ git branch</b>
@@ -504,6 +505,7 @@ <h2>
504505
<code>git log</code> when you are in that branch. For example, if we run
505506
<code>git log</code> in the Hello World project that we have been working
506507
on in this section, we'll see all the commit messages that we've done.
508+
</p>
507509

508510
<pre>
509511
<b>$ git log</b>

creating/index.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ <h2>Getting and Creating Projects</h2>
1717
public Git repository, as you would do if you wanted a copy or wanted to
1818
work with someone on a project. We will cover both of these here.
1919
</p>
20+
2021
</div>
2122
</div>
2223

@@ -31,37 +32,41 @@ <h2>
3132
</h2>
3233

3334
<div class="block">
34-
To create a repository from an existing directory of files, you can
35+
<p>To create a repository from an existing directory of files, you can
3536
simply run <code>git init</code> in that directory. For example,
3637
let's say we have a directory with a few files in it, like this:
38+
</p>
3739

3840
<pre>
3941
<b>$ cd konichiwa</b>
4042
<b>$ ls</b>
4143
README hello.rb
4244
</pre>
4345

44-
This is a project where we are writing examples of the "Hello World"
46+
<p>This is a project where we are writing examples of the "Hello World"
4547
program in every language. So far, we just have Ruby, but hey, it's
4648
a start. To start version controlling this with Git, we can simply
4749
run <code>git init</code>.
50+
</p>
4851

4952
<pre>
5053
<b>$ git init</b>
5154
Initialized empty Git repository in /opt/konichiwa/.git/
5255
</pre>
5356

54-
Now you can see that there is a <code>.git</code> subdirectory in your
57+
<p>Now you can see that there is a <code>.git</code> subdirectory in your
5558
project. This is your Git repository where all the data of your
5659
project snapshots are stored.
60+
</p>
5761

5862
<pre>
5963
<b>$ ls -a</b>
6064
. .. .git README hello.rb
6165
</pre>
6266

63-
Congratulations, you now have a skeleton Git repository and can start
67+
<p>Congratulations, you now have a skeleton Git repository and can start
6468
snapshotting your project.
69+
</p>
6570

6671
<p class="nutshell">
6772
<strong>In a nutshell</strong>, you use <code>git init</code> to make an

inspect/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ <h2>
417417

418418
<p>That's what we're looking for, but we don't want to have to figure out
419419
what commit the two branches diverged from every time. Luckily, Git has a
420-
shortcut for this. If you run <code>git diff master...erlang</code> (with three dots in between the branch names), Git will automatically figure out
420+
shortcut for this. If you run <code>git diff master...erlang</code> (with
421+
three dots in between the branch names), Git will automatically figure out
421422
what the common commit (otherwise known as the "merge base") of the two
422423
commit is and do the diff off of that.</p>
423424

remotes/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ <h2>
315315
<p>If you have more than one remote repository, you can either fetch from specific
316316
ones by running <code>git fetch [alias]</code> or you can tell Git to synchronize
317317
with all of your remotes by running <code>git fetch --all</code>.
318+
</p>
318319

319320
<p class="nutshell">
320321
<b>In a nutshell</b> you run <code>git fetch [alias]</code> to synchronize your
@@ -358,7 +359,7 @@ <h2>
358359
what I have committed and all of its history.</p>
359360

360361
<p>What if I have a topic branch like the 'erlang' branch we created earlier
361-
and I just want to share that? You can just push that branch instead.
362+
and I just want to share that? You can just push that branch instead.</p>
362363

363364
<pre>
364365
<b>$ git push github erlang</b>
@@ -403,6 +404,7 @@ <h2>
403404

404405
<p>You can fix this by running <code>git fetch github; git merge github/master</code>
405406
and then pushing again.
407+
</p>
406408

407409
<p class="nutshell">
408410
<b>In a nutshell</b> you run <code>git push [alias] [branch]</code> to update a

zh/branching/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ <h4>
7979
</h4>
8080

8181
<p>我们动手创建一个分支,并切换过去。执行 <code>git branch (branchname)</code> 即可。
82+
</p>
8283

8384
<pre>
8485
$ git branch testing
@@ -334,7 +335,7 @@ <h4>
334335
<p>那么,Git 合并很有魔力,我们再也不用处理合并冲突了,对吗?不太确切。
335336
不同分支中修改了相同区块的代码,电脑自己猜不透神马的情况下,冲突就摆在我们面前了。
336337
我们看看两个分支中改了同一行代码的例子。
337-
<p>
338+
</p>
338339

339340
<pre>
340341
<b>$ git branch</b>

zh/creating/index.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ <h2>
2727
</h2>
2828

2929
<div class="block">
30-
在目录中执行 <code>git init</code>,就可以创建一个 Git 仓库了。比如,我们恰好有个目录,里头有些许文件,如下:
30+
<p>在目录中执行 <code>git init</code>,就可以创建一个 Git 仓库了。比如,我们恰好有个目录,里头有些许文件,如下:
31+
</p>
3132
<pre>
3233
<b>$ cd konichiwa</b>
3334
<b>$ ls</b>
@@ -54,7 +55,8 @@ <h2>
5455
. .. .git README hello.rb
5556
</pre>
5657

57-
恭喜,现在你就有了一个 Git 仓库的架子,可以开始快照你的项目了。
58+
<p>恭喜,现在你就有了一个 Git 仓库的架子,可以开始快照你的项目了。
59+
</p>
5860

5961
<p class="nutshell">
6062
<strong>简而言之</strong>,用 <code>git init</code> 来在目录中创建新的 Git 仓库。

zh/inspect/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ <h2>
437437
2 files changed, 9 insertions(+), 0 deletions(-)
438438
</pre>
439439

440-
<p>当然,我会推荐简单点的那个。</>
440+
<p>当然,我会推荐简单点的那个。</p>
441441

442442

443443
<p class="nutshell">

0 commit comments

Comments
 (0)