File tree Expand file tree Collapse file tree 5 files changed +119
-8
lines changed Expand file tree Collapse file tree 5 files changed +119
-8
lines changed Original file line number Diff line number Diff line change @@ -67,19 +67,20 @@ <h3><a href="/branching">Branching and Merging</a></h3>
67
67
< div class ="block ">
68
68
< h3 > < a href ="/remotes "> Sharing and Updating Projects</ a > </ h3 >
69
69
< ul >
70
- < li > < a href ="/remotes/fetch-pull.html "> fetch, pull</ a > </ li >
71
- < li > < a href ="/remotes/push.html "> push</ a > </ li >
70
+ < li > < a href ="/remotes/# fetch "> fetch, pull</ a > </ li >
71
+ < li > < a href ="/remotes/# push "> push</ a > </ li >
72
72
</ ul >
73
73
</ div >
74
74
75
75
< div class ="block ">
76
76
< h3 > < a href ="/inspect "> Inspection and Comparison</ a > </ h3 >
77
77
< ul >
78
- < li > < a href ="/inspect/log.html "> log</ a > </ li >
79
- < li > < a href ="/inspect/diff.html "> diff</ a > </ li >
78
+ < li > < a href ="/inspect/# log "> log</ a > </ li >
79
+ < li > < a href ="/inspect/# diff "> diff</ a > </ li >
80
80
</ ul >
81
81
</ div >
82
82
83
+ <!--
83
84
<div class="block">
84
85
<h3><a href="/fixing">Fixing and Changing History</a></h3>
85
86
<ul>
@@ -90,7 +91,7 @@ <h3><a href="/fixing">Fixing and Changing History</a></h3>
90
91
<li><a href="/fixing/cherry-pick.html">cherry-pick</a></li>
91
92
</ul>
92
93
</div>
93
-
94
+ -->
94
95
</ div >
95
96
96
97
< div class ="grid_10 home_box " id ="content_box ">
Original file line number Diff line number Diff line change 634
634
< span class ="red "> M</ span > hello.rb
635
635
</ pre >
636
636
637
- < p > Now you can run a < code > git commit</ span > which will just record
637
+ < p > Now you can run a < code > git commit</ code > which will just record
638
638
the changes to the < code > README</ code > file, not the now unstaged
639
639
< code > hello.rb</ code > .
640
640
</ p >
735
735
</ div >
736
736
</ div >
737
737
738
- < p > < a href ="/basic "> On to Branching and Merging »</ a > </ p >
738
+ < p > < a href ="/branching "> On to Branching and Merging »</ a > </ p >
739
739
Original file line number Diff line number Diff line change 690
690
</ div >
691
691
</ div >
692
692
693
- < p > < a href ="/basic "> On to Sharing and Updating Projects »</ a > </ p >
693
+ < p > < a href ="/remotes "> On to Sharing and Updating Projects »</ a > </ p >
694
694
Original file line number Diff line number Diff line change
1
+ ---
2
+ layout: reference
3
+ ---
4
+
5
+ < div class ="box ">
6
+ < h2 >
7
+ < span class ="docs ">
8
+ < a target ="new " href ="http://progit.org/book "> book</ a >
9
+ </ span >
10
+ Inspection and Comparison
11
+ </ h2 >
12
+ < div class ="block ">
13
+ < p class ="nutshell ">
14
+ < b > In a nutshell</ b > blah.
15
+ </ p >
16
+ </ div >
17
+ </ div >
18
+
19
+ < div class ="box ">
20
+ < h2 >
21
+ < span class ="docs ">
22
+ < a target ="new " href ="http://www.kernel.org/pub/software/scm/git/docs/git-log.html "> docs</ a >
23
+ < a target ="new " href ="http://progit.org/book/ "> book</ a >
24
+ </ span >
25
+ < a name ="log "> git log</ a >
26
+ < span class ="desc "> </ span >
27
+ </ h2 >
28
+
29
+ < div class ="block ">
30
+ < p > Cool.</ p >
31
+ </ div >
32
+ </ div >
33
+
34
+ < div class ="box ">
35
+ < h2 >
36
+ < span class ="docs ">
37
+ < a target ="new " href ="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html "> docs</ a >
38
+ < a target ="new " href ="http://progit.org/book/ "> book</ a >
39
+ </ span >
40
+ < a name ="diff "> git diff</ a >
41
+ < span class ="desc "> </ span >
42
+ </ h2 >
43
+
44
+ < div class ="block ">
45
+ < p > Cool.</ p >
46
+ </ div >
47
+ </ div >
48
+
49
+ < p > And that's it! For more information, try reading the
50
+ < a href ="http://progit.org "> Pro Git book</ a > .</ p >
Original file line number Diff line number Diff line change
1
+ ---
2
+ layout: reference
3
+ ---
4
+
5
+ < div class ="box ">
6
+ < h2 >
7
+ < span class ="docs ">
8
+ < a target ="new " href ="http://progit.org/book "> book</ a >
9
+ </ span >
10
+ Sharing and Updating Projects
11
+ </ h2 >
12
+ < div class ="block ">
13
+ < p class ="nutshell ">
14
+ < b > In a nutshell</ b > you can update your project with < code > git fetch</ code >
15
+ and share your changes with < code > git push</ code > .
16
+ </ p >
17
+ </ div >
18
+ </ div >
19
+
20
+ < div class ="box ">
21
+ < h2 >
22
+ < span class ="docs ">
23
+ < a target ="new " href ="http://www.kernel.org/pub/software/scm/git/docs/git-fetch.html "> docs</ a >
24
+ < a target ="new " href ="http://progit.org/book/ "> book</ a >
25
+ </ span >
26
+ < a name ="fetch "> git fetch</ a >
27
+ < span class ="desc "> download new branches and data from a remote repository</ span >
28
+ </ h2 >
29
+
30
+ < br />
31
+
32
+ < h2 >
33
+ < span class ="docs ">
34
+ < a target ="new " href ="http://www.kernel.org/pub/software/scm/git/docs/git-pull.html "> docs</ a >
35
+ < a target ="new " href ="http://progit.org/book/ "> book</ a >
36
+ </ span >
37
+ < a name ="pull "> git pull</ a >
38
+ < span class ="desc "> fetch from a remote repo and try to merge into the current branch</ span >
39
+ </ h2 >
40
+ < div class ="block ">
41
+ < p > Cool.</ p >
42
+ </ div >
43
+ </ div >
44
+
45
+ < div class ="box ">
46
+ < h2 >
47
+ < span class ="docs ">
48
+ < a target ="new " href ="http://www.kernel.org/pub/software/scm/git/docs/git-push.html "> docs</ a >
49
+ < a target ="new " href ="http://progit.org/book/ "> book</ a >
50
+ </ span >
51
+ < a name ="push "> git push</ a >
52
+ < span class ="desc "> push your new branches and data to a remote repository</ span >
53
+ </ h2 >
54
+
55
+ < div class ="block ">
56
+ < p > Cool.</ p >
57
+ </ div >
58
+ </ div >
59
+
60
+ < p > < a href ="/inspect "> On to Inspection and Comparison »</ a > </ p >
You can’t perform that action at this time.
0 commit comments