Pair up dangling paragraph tags; Make sure all text at least in P
Closing P tags are missing or mistyped for another letter. Other chunks of text need to be wrapped in P tags to fall inline with rest of page and not run with such wild abandon.
Soon Van committed
Dec 22, 2012 at 16:26 UTC
48532993de55beb1315104de4dd8d21cf34a3f59
7 files changed
+25
-12
branching/index.html
+4
-2
@@ -95,6 +95,7 @@ $ git branch
95
96
<p>So let's start by creating a new branch and switching to it. You can do
97
that by running <code>git branch (branchname)</code>.
98
+ </p>
99
100
<pre>
101
$ git branch testing
@@ -306,7 +307,7 @@ class HiWorld
307
revert to what it was before I switched branches. Here I can change
308
something different (in this case the printed output) and at the same
309
time rename the file from <code>hello.rb</code> to <code>ruby.rb</code>.
309
- </b>
310
+ </p>
311
312
<pre>
313
<b>$ git checkout master</b>
@@ -372,7 +373,7 @@ HiWorld.hello
373
of code is edited in different branches there is no way for a computer
374
to figure it out, so it's up to us. Let's see another example of changing
375
the same line in two branches.
375
- <p>
376
+ </p>
377
378
<pre>
379
<b>$ git branch</b>
@@ -504,6 +505,7 @@ M README
505
<code>git log</code> when you are in that branch. For example, if we run
506
<code>git log</code> in the Hello World project that we have been working
507
on in this section, we'll see all the commit messages that we've done.
508
+ </p>
509
510
<pre>
511
<b>$ git log</b>
creating/index.html
+9
-4
@@ -17,6 +17,7 @@ layout: reference
17
public Git repository, as you would do if you wanted a copy or wanted to
18
work with someone on a project. We will cover both of these here.
19
</p>
20
+
21
</div>
22
</div>
23
@@ -31,9 +32,10 @@ layout: reference
32
</h2>
33
34
<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
36
simply run <code>git init</code> in that directory. For example,
37
let's say we have a directory with a few files in it, like this:
38
+ </p>
39
40
<pre>
41
<b>$ cd konichiwa</b>
@@ -41,27 +43,30 @@ layout: reference
43
README hello.rb
44
</pre>
45
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"
47
program in every language. So far, we just have Ruby, but hey, it's
48
a start. To start version controlling this with Git, we can simply
49
run <code>git init</code>.
50
+ </p>
51
52
<pre>
53
<b>$ git init</b>
54
Initialized empty Git repository in /opt/konichiwa/.git/
55
</pre>
56
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
58
project. This is your Git repository where all the data of your
59
project snapshots are stored.
60
+ </p>
61
62
<pre>
63
<b>$ ls -a</b>
64
. .. .git README hello.rb
65
</pre>
66
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
68
snapshotting your project.
69
+ </p>
70
71
<p class="nutshell">
72
<strong>In a nutshell</strong>, you use <code>git init</code> to make an
inspect/index.html
+2
-1
@@ -417,7 +417,8 @@ index bb86f00..192151c 100644
417
418
<p>That's what we're looking for, but we don't want to have to figure out
419
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
422
what the common commit (otherwise known as the "merge base") of the two
423
commit is and do the diff off of that.</p>
424
remotes/index.html
+3
-1
@@ -315,6 +315,7 @@ From github.com:schacon/hw
315
<p>If you have more than one remote repository, you can either fetch from specific
316
ones by running <code>git fetch [alias]</code> or you can tell Git to synchronize
317
with all of your remotes by running <code>git fetch --all</code>.
318
+ </p>
319
320
<p class="nutshell">
321
<b>In a nutshell</b> you run <code>git fetch [alias]</code> to synchronize your
@@ -358,7 +359,7 @@ To git@github.com:schacon/hw.git
359
what I have committed and all of its history.</p>
360
361
<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>
363
364
<pre>
365
<b>$ git push github erlang</b>
@@ -403,6 +404,7 @@ fast-forwards' section of 'git push --help' for details.
404
405
<p>You can fix this by running <code>git fetch github; git merge github/master</code>
406
and then pushing again.
407
+ </p>
408
409
<p class="nutshell">
410
<b>In a nutshell</b> you run <code>git push [alias] [branch]</code> to update a
zh/branching/index.html
+2
-1
@@ -79,6 +79,7 @@ $ git branch
79
</h4>
80
81
<p>我们动手创建一个分支，并切换过去。执行 <code>git branch (branchname)</code> 即可。
82
+ </p>
83
84
<pre>
85
$ git branch testing
@@ -334,7 +335,7 @@ HiWorld.hello
335
<p>那么，Git 合并很有魔力，我们再也不用处理合并冲突了，对吗？不太确切。
336
不同分支中修改了相同区块的代码，电脑自己猜不透神马的情况下，冲突就摆在我们面前了。
337
我们看看两个分支中改了同一行代码的例子。
337
- <p>
338
+ </p>
339
340
<pre>
341
<b>$ git branch</b>
zh/creating/index.html
+4
-2
@@ -27,7 +27,8 @@ layout: zh_reference
27
</h2>
28
29
<div class="block">
30
- 在目录中执行 <code>git init</code>，就可以创建一个 Git 仓库了。比如，我们恰好有个目录，里头有些许文件，如下：
30
+ <p>在目录中执行 <code>git init</code>，就可以创建一个 Git 仓库了。比如，我们恰好有个目录，里头有些许文件，如下：
31
+ </p>
32
<pre>
33
<b>$ cd konichiwa</b>
34
<b>$ ls</b>
@@ -54,7 +55,8 @@ Initialized empty Git repository in /opt/konichiwa/.git/
55
. .. .git README hello.rb
56
</pre>
57
57
- 恭喜，现在你就有了一个 Git 仓库的架子，可以开始快照你的项目了。
58
+ <p>恭喜，现在你就有了一个 Git 仓库的架子，可以开始快照你的项目了。
59
+ </p>
60
61
<p class="nutshell">
62
<strong>简而言之</strong>，用 <code>git init</code> 来在目录中创建新的 Git 仓库。
zh/inspect/index.html
+1
-1
@@ -437,7 +437,7 @@ index bb86f00..192151c 100644
437
2 files changed, 9 insertions(+), 0 deletions(-)
438
</pre>
439
440
- <p>当然，我会推荐简单点的那个。</>
440
+ <p>当然，我会推荐简单点的那个。</p>
441
442
443
<p class="nutshell">