Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

consolidated the scripting into one chapter, merged advanced merging …

…into one chapter
  • Loading branch information...
commit 640afafd1f21a27e7d4ac6ee86522c9609011f5e 1 parent 33449ca
@schacon schacon authored
View
6 script/html.rb
@@ -5,6 +5,8 @@
require 'rdiscount'
require "uv"
+MIN_SIZE = 1200
+
def do_replacements(html, type = :html)
# highlight code
@@ -129,7 +131,7 @@ def do_replacements(html, type = :html)
toc.table do
section_array.each do |chapter_title, chapter_file, chsize|
toc.tr { toc.td {
- (chsize > 800) ? extra = 'done' : extra = 'todo'
+ (chsize > MIN_SIZE) ? extra = 'done' : extra = 'todo'
toc.a(:href => chapter_file, :class => "chapter-link #{extra}") << chapter_title
}}
end
@@ -142,7 +144,7 @@ def do_replacements(html, type = :html)
toc.table do
section_array.each do |chapter_title, chapter_file, chsize|
toc.tr { toc.td {
- (chsize > 300) ? extra = 'done' : extra = 'todo'
+ (chsize > MIN_SIZE) ? extra = 'done' : extra = 'todo'
toc.a(:href => chapter_file, :class => "chapter-link #{extra}") << chapter_title
}}
end
View
6 text/25_Changing_Your_History/0_Changing_History.markdown
@@ -0,0 +1,6 @@
+## Modifying your History ##
+
+Interactive rebasing is a good way to modify individual commits.
+
+linkgit:git-filter-branch[1] is a good way to edit commits en masse.
+
View
5 text/25_Filter_Branch/0_Git_Filter_Branch.markdown
@@ -1,5 +0,0 @@
-## Filtering Branches ##
-
-linkgit:git-filter-branch[1]
-
-can rewrite history
View
0  ..._ Advanced_Branching_And_Merging.markdown → ...0_Advanced_Branching_And_Merging.markdown
File renamed without changes
View
3  ...d_Merging_Multiway_Merge_Subtree.markdown → ...d_Merging_Multiway_Merge_Subtree.markdown
@@ -1,7 +1,6 @@
-## Advanced Merging ##
+### Multiway Merge ###
-### Multiway Merge ###
You can merge several heads at one time by simply listing them on the same
linkgit:git-merge[1] command. For instance,
View
1  text/37_Capistrano_and_Git/0_ Capistrano_and_Git.markdown
@@ -1 +0,0 @@
-##Capistrano and Git
View
7 text/37_Deploying_with_Git/0_ Capistrano_and_Git.markdown
@@ -0,0 +1,7 @@
+## Deploying with Git ##
+
+### Capistrano and Git ###
+
+[GitHub Guide on Deploying with Cap](http://github.com/guides/deploying-with-capistrano)
+
+[Git and Capistrano Screencast](http://www.vimeo.com/369095)
View
11 text/39_SCM_Migration/0_Scm_Migration.markdown
@@ -24,4 +24,15 @@ Python script that will import a Perforce repository for you.
$ ~/git.git/contrib/fast-import/git-p4 clone //depot/project/main@all myproject
+### Importing Others ###
+
+These are other SCMs that listed high on the Git Survey, should find import
+docs for them. !!TODO!!
+
+* CVS
+* Mercurial (hg)
+
+* Bazaar-NG
+* Darcs
+* ClearCase
View
25 text/40_Graphical_Git_gitgui_gitk/0_ Graphical_Git_gitgui_gitk.markdown
@@ -1,5 +1,26 @@
## Graphical Git ##
-gitgui
+Git has a couple of fairly popular Graphial User Interfaces that can
+read and/or maniplulate Git repositories.
+
+### Bundled GUIs ###
+
+Git comes with two major GUI programs written in Tcl/Tk. Gitk is a
+repository browser and commit history visualization tool.
+
+[gitk](http://www.kernel.org/pub/software/scm/git/docs/gitk.html)
+
+linkgit:git-gui[1] is a tool that helps you visualize the index operations,
+like add, remove and commit. It won't do everything you can do on the
+command line, but for many of the basic operations, it's pretty good.
+
+[git gui](http://www.kernel.org/pub/software/scm/git/docs/git-gui.html)
-gitk
+### Third Party Projects ###
+
+For Mac users, there is
+[GitNub](http://github.com/Caged/gitnub/wikis)
+
+For Linux or other Qt users, there is
+[QGit](http://digilander.libero.it/mcostalba/)
+
View
3  text/44_Ruby_and_Git_grit/0_ Ruby_and_Git_grit.markdown
@@ -1,3 +0,0 @@
-## Ruby and Git ##
-
-grit
View
23 text/44_Scripting_and_Git/0_ Ruby_and_Git_grit.markdown
@@ -0,0 +1,23 @@
+## Scripting and Git ##
+
+
+### Ruby and Git ###
+
+grit
+
+jgit + jruby
+
+
+### PHP and Git ###
+
+
+
+### Python and Git ###
+
+pygit
+
+
+### Perl and Git ###
+
+perlgit
+
View
3  text/45_Perl_and_Git_perlgit/0_ Perl_and_Git_perlgit.markdown
@@ -1,3 +0,0 @@
-## Perl and Git ##
-
-perlgit
View
3  text/46_Python_and_Git_pygit/0_ Python_and_Git_pygit.markdown
@@ -1,3 +0,0 @@
-## Python and Git ##
-
-pygit

0 comments on commit 640afaf

Please sign in to comment.
Something went wrong with that request. Please try again.