Skip to content

Commit 640afaf

Browse files
schaconschacon
committed
consolidated the scripting into one chapter, merged advanced merging into one chapter
1 parent 33449ca commit 640afaf

File tree

13 files changed

+75
-21
lines changed

13 files changed

+75
-21
lines changed

‎script/html.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
require 'rdiscount'
66
require "uv"
77

8+
MIN_SIZE = 1200
9+
810
def do_replacements(html, type = :html)
911

1012
# highlight code
@@ -129,7 +131,7 @@ def do_replacements(html, type = :html)
129131
toc.table do
130132
section_array.each do |chapter_title, chapter_file, chsize|
131133
toc.tr { toc.td {
132-
(chsize > 800) ? extra = 'done' : extra = 'todo'
134+
(chsize > MIN_SIZE) ? extra = 'done' : extra = 'todo'
133135
toc.a(:href => chapter_file, :class => "chapter-link #{extra}") << chapter_title
134136
}}
135137
end
@@ -142,7 +144,7 @@ def do_replacements(html, type = :html)
142144
toc.table do
143145
section_array.each do |chapter_title, chapter_file, chsize|
144146
toc.tr { toc.td {
145-
(chsize > 300) ? extra = 'done' : extra = 'todo'
147+
(chsize > MIN_SIZE) ? extra = 'done' : extra = 'todo'
146148
toc.a(:href => chapter_file, :class => "chapter-link #{extra}") << chapter_title
147149
}}
148150
end

‎text/25_Changing_Your_History/0_Changing_History.markdown

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Modifying your History ##
2+
3+
Interactive rebasing is a good way to modify individual commits.
4+
5+
linkgit:git-filter-branch[1] is a good way to edit commits en masse.
6+

‎text/25_Filter_Branch/0_Git_Filter_Branch.markdown

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎text/26_Advanced_Branching_And_Merging/0_ Advanced_Branching_And_Merging.markdown renamed to ‎text/26_Advanced_Branching_And_Merging/0_Advanced_Branching_And_Merging.markdown

File renamed without changes.

‎text/33_Advanced_Merging_Multiway_Merge_Subtree/0_ Advanced_Merging_Multiway_Merge_Subtree.markdown renamed to ‎text/26_Advanced_Branching_And_Merging/1_Advanced_Merging_Multiway_Merge_Subtree.markdown

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
## Advanced Merging ##
1+
### Multiway Merge ###
22

33

4-
### Multiway Merge ###
54

65
You can merge several heads at one time by simply listing them on the same
76
linkgit:git-merge[1] command. For instance,

‎text/37_Capistrano_and_Git/0_ Capistrano_and_Git.markdown

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎text/37_Deploying_with_Git/0_ Capistrano_and_Git.markdown

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Deploying with Git ##
2+
3+
### Capistrano and Git ###
4+
5+
[GitHub Guide on Deploying with Cap](http://github.com/guides/deploying-with-capistrano)
6+
7+
[Git and Capistrano Screencast](http://www.vimeo.com/369095)

‎text/39_SCM_Migration/0_Scm_Migration.markdown

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,15 @@ Python script that will import a Perforce repository for you.
2424
$ ~/git.git/contrib/fast-import/git-p4 clone //depot/project/main@all myproject
2525

2626

27+
### Importing Others ###
28+
29+
These are other SCMs that listed high on the Git Survey, should find import
30+
docs for them. !!TODO!!
31+
32+
* CVS
33+
* Mercurial (hg)
34+
35+
* Bazaar-NG
36+
* Darcs
37+
* ClearCase
2738

‎text/40_Graphical_Git_gitgui_gitk/0_ Graphical_Git_gitgui_gitk.markdown

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
## Graphical Git ##
22

3-
gitgui
3+
Git has a couple of fairly popular Graphial User Interfaces that can
4+
read and/or maniplulate Git repositories.
5+
6+
### Bundled GUIs ###
7+
8+
Git comes with two major GUI programs written in Tcl/Tk. Gitk is a
9+
repository browser and commit history visualization tool.
10+
11+
[gitk](http://www.kernel.org/pub/software/scm/git/docs/gitk.html)
12+
13+
linkgit:git-gui[1] is a tool that helps you visualize the index operations,
14+
like add, remove and commit. It won't do everything you can do on the
15+
command line, but for many of the basic operations, it's pretty good.
16+
17+
[git gui](http://www.kernel.org/pub/software/scm/git/docs/git-gui.html)
418

5-
gitk
19+
### Third Party Projects ###
20+
21+
For Mac users, there is
22+
[GitNub](http://github.com/Caged/gitnub/wikis)
23+
24+
For Linux or other Qt users, there is
25+
[QGit](http://digilander.libero.it/mcostalba/)
26+

‎text/44_Ruby_and_Git_grit/0_ Ruby_and_Git_grit.markdown

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎text/44_Scripting_and_Git/0_ Ruby_and_Git_grit.markdown

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## Scripting and Git ##
2+
3+
4+
### Ruby and Git ###
5+
6+
grit
7+
8+
jgit + jruby
9+
10+
11+
### PHP and Git ###
12+
13+
14+
15+
### Python and Git ###
16+
17+
pygit
18+
19+
20+
### Perl and Git ###
21+
22+
perlgit
23+

‎text/45_Perl_and_Git_perlgit/0_ Perl_and_Git_perlgit.markdown

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎text/46_Python_and_Git_pygit/0_ Python_and_Git_pygit.markdown

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)