progit / progit2 Goto Github PK

View Code? Open in Web Editor NEW

5.6K 5.6K 1.9K 182.63 MB

Pro Git 2nd Edition

License: Other

Ruby 17.39% HTML 1.75% CSS 58.72% XSLT 22.14%

asciidoc book git pro-git

progit2's Issues

book errata

In section 4.6 (Smart HTTP Server Setup) You have an error:

This code specifies instructions for the auth_basic modual for apache (which provides AuthType Basic):

<LocationMatch "^/git/.*/git-receive-pack$">
AuthType Basic
AuthName "Git Access"
AuthUserFile /opt/git/.htpasswd
Require valid-user
"</LocationMatch">

But this instruction just below it is for use with the auth_digest module (Providing AuthType Digest);

htdigest -c /opt/git/.htpasswd "Git Access" schacon

The second element of code should be
htpasswd ... instead of htdigest.

"I" -> "We"

I like the first-person voice in the first edition, but it's weird seeing it in a book with two authors. I think we can use "we" in most cases and not lose anything.

Scale figures up to print resolution

Is 150 dpi high enough for print?

Misleading caption for image basic-rebase-3

The caption under figure basic-rebase-3 says:

Rebasing the change introduced in C3 onto C4

But the image suggests it should be the other way around.

cleaned up images

@jasonlong contributed a suggested redesign for our diagrams.

I would like to try converting some of our images to this style to see if it's nicer.

Mention rerere in Chapter 5

Migrating this from #27. rerere should be mentioned briefly somewhere in Chapter 5, and link over to Chapter 6. This was discussed in #1 (comment).

No chapter on Gitolite

The v2 version has new chapter on GitLab, but lost chapters about Gitosis (which is practically unmaintained) and Gitolite.

Homebrew install on osx?

#26 (comment). Homebrew is fairly widely adopted, but mentioning three install methods for OSX might be a bit overkill. Thoughts?

.git/info/exclude

Probably should cover this, perhaps in Internals. Right now the only mention is in the git-svn section.

Command-line tips from blog post

Mentioned in #1, this blog post has some good tips that we should add:

git log -S'pattern'
git log ..BRANCH
git branch --contains
git shortlog -sn

Git + TFS

http://git-tfs.com/ or https://gittf.codeplex.com/

Atlas: callout issues

Check out this PDF, page 329. The callout graphics are rendered as missing images. Here's what it looks like when Atom renders it:

Tracking/Upstream Branches

It was mentioned in #39 to add "upstream" content to the "Tracking Branches" section. I'm not quite sure what that means, so this is a reminder to circle back and fix it later.

So the .mobi format is pretty big, weighing in at about 85M as opposed to 25-30M for the other formats, most of which are big images. I just pngcrushed them, which brought them down 10M (from 35-40M), but the .mobi file is apparently always going to be 3x bigger because of how Amazon's kindlegen tool works:

From http://forum.atlas.oreilly.com/t/non-unicode-arial-ttf-file-option/20/4:

Generally, MOBI files are around 2-3 times the size of the corresponding EPUB, because we use Amazon's kindlegen tool to generate EPUB from MOBI (the only tool officially endorsed for this purpose), and kindlegen requires three copies of the ebook content to be archived in each MOBI file: the original EPUB source, a legacy MOBI7 version of the content for older-model Kindle devices, and a KF8 version of the content for Kindle devices/apps that support the latest Kindle formatting specs. When MOBI files are posted to Amazon for sale, Amazon will serve the appropriate version of the content to customers, based on the device to which they're downloading the file, so the file size will ultimately be smaller again on the Kindle device/app.

So, the question is if this format is really even useful to us. If Kindles generally support ePub and PDF now should I even be putting .mobi files on the site at all, since they're optimized for Amazon upload and not for this purpose. Or maybe there is a way to pull the KF8 format out separately for that purpose?

fix .mobi issue

.mobi version is cutting off the image in Atlas output

I've filed an issue in the forum.

credential caching help in Git Basics or Setup?

We may want to put some basic credential caching tips earlier, since HTTPS access is common now and we don't want people having to type user/pass all the time.

Indonesian translation (id)

Hi, I want to open a new translation to Indonesian. I have visited the https://progit.org/translations page, but there is no instructions about it yet.

Difftools

Valid built-in values are: "araxis", "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" and "xxdiff"

As far as I khow and understand correctly, git diff compares working directory with what is committed and not with what is in staging area

Check all cross-references

Some chapter numbers have changed. Consider making some/all of these into links.

All links to images are invalid

Example from the book:

https://github.com/progit/progit2/raw/master/book/01-introduction/sections/images/local.png

Must be changed to:

https://github.com/progit/progit2/blob/master/book/01-introduction/images/local.png

ePub check issue

This appears to be preventing the book from being able to be uploaded to Google Play.

$ java -jar epubcheck.jar ~/Downloads/progit-en.31.epub 
Validating against EPUB version 3.0 - custom validation
ERROR(RSC-001): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app02.html(148,278): File 'assets/7.png' is not found.
ERROR(RSC-001): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app02.html(150,370): File 'assets/8.png' is not found.
ERROR(RSC-001): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app02.html(166,158): File 'assets/7.png' is not found.
ERROR(RSC-001): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app02.html(168,158): File 'assets/8.png' is not found.
Validating using EPUB version 3.0 rules.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,1627): XHTML Content Document file name 'OEBPS/cover.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,1709): XHTML Content Document file name 'OEBPS/index.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18361): XHTML Content Document file name 'OEBPS/preface01.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18449): XHTML Content Document file name 'OEBPS/preface02.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18537): XHTML Content Document file name 'OEBPS/preface03.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18634): XHTML Content Document file name 'OEBPS/toc01.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18717): XHTML Content Document file name 'OEBPS/ch01.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18800): XHTML Content Document file name 'OEBPS/ch02.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18883): XHTML Content Document file name 'OEBPS/ch03.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,18966): XHTML Content Document file name 'OEBPS/ch04.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19049): XHTML Content Document file name 'OEBPS/ch05.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19133): XHTML Content Document file name 'OEBPS/ch06.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19217): XHTML Content Document file name 'OEBPS/ch07.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19301): XHTML Content Document file name 'OEBPS/ch08.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19385): XHTML Content Document file name 'OEBPS/ch09.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19469): XHTML Content Document file name 'OEBPS/ch10.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19555): XHTML Content Document file name 'OEBPS/app01.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19641): XHTML Content Document file name 'OEBPS/app02.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19727): XHTML Content Document file name 'OEBPS/app03.html' should have the extension '.xhtml'.
WARNING(HTM-014a): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/content.opf(2,19809): XHTML Content Document file name 'OEBPS/ix01.html' should have the extension '.xhtml'.
ERROR(RSC-001): /Users/schacon/Downloads/progit-en.31.epub/progit-en.31.epub(-1,-1): File 'OEBPS/assets/7.png' is not found.
ERROR(RSC-001): /Users/schacon/Downloads/progit-en.31.epub/progit-en.31.epub(-1,-1): File 'OEBPS/assets/8.png' is not found.
ERROR(RSC-005): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/ch01.html(326,127): Error while parsing file 'value of attribute "width" is invalid; must be an integer'.
ERROR(RSC-005): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/ch03.html(1191,156): Error while parsing file 'value of attribute "width" is invalid; must be an integer'.
ERROR(RSC-005): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/ch03.html(1196,161): Error while parsing file 'value of attribute "width" is invalid; must be an integer'.
ERROR(RSC-005): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/ch03.html(1201,216): Error while parsing file 'value of attribute "width" is invalid; must be an integer'.
ERROR(RSC-005): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/ch06.html(0,0): Error while parsing file 'duplicate id: _pr_fail'.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,25645): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,25796): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,25941): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,26072): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,26217): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,26356): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,26493): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,26631): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,26829): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,26975): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,27127): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,27281): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,27430): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,27595): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,27741): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,27903): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,28072): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,28215): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,28353): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,28504): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,28671): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,28809): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,28953): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,29107): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,29255): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,29409): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,29588): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,29728): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,29865): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,30006): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,30165): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,30291): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,30420): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,30557): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,30714): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,30857): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,31011): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,31180): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,31319): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc.ncx(2,31469): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2191,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2211,67): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2223,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2237,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2251,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2265,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2279,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2293,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2307,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2321,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2341,56): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2353,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2367,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2381,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2401,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2415,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2429,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2443,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2457,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2471,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2485,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/toc01.html(2505,55): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app03.html(252,78): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app03.html(514,46): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app03.html(602,137): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app03.html(604,172): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app03.html(656,50): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app03.html(1028,133): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/app03.html(1274,106): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/ix01.html(2,17594): Fragment identifier is not defined.
ERROR(RSC-012): /Users/schacon/Downloads/progit-en.31.epub/OEBPS/ix01.html(2,17858): Fragment identifier is not defined.

Check finished with errors

epubcheck completed

I'll look into this and if I can't figure it out, I'll file an issue in Atlas.

Repository: https://github.com/progit-ko/progit2-ko
Guidelines: https://github.com/progit-ko/progit2-ko/wiki

Installing

This seems more reasonable in modern times:

Mac binary install
1. bare/homebrew
2. GHfM
Windows binary install
1. bare
2. GHfW
*nix binary install (apt-get and friends)
Building from source
1. *nix
2. mingw

Chapter 3:
- 318
- 319
- 320
- 321
- 327
- 328
- 329
- 330
Chapter 7
- reset-ex2 through 7 (from the Three Trees blog post)

Recommend Projects

React

A declarative, efficient, and flexible JavaScript library for building user interfaces.
Vue.js

🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
Typescript

TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
TensorFlow

An Open Source Machine Learning Framework for Everyone
Django

The Web framework for perfectionists with deadlines.
Laravel

A PHP framework for web artisans
D3

Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

javascript

JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
web

Some thing interesting about web. New door for the world.
server

A server is a program made to process requests and deliver data to clients.
Machine learning

Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Visualization

Some thing interesting about visualization, use data art
Game

Some thing interesting about game, make everyone happy.

Recommend Org

Facebook

We are working to build community through open source technology. NB: members must have two-factor auth.
Microsoft

Open source projects and samples from Microsoft.
Google

Google ❤️ Open Source for everyone.
Alibaba

Alibaba Open Source for everyone
D3

Data-Driven Documents codes.
Tencent

China tencent open source team.