Pro Git Book

Hey all,

Just a heads up - I've been working on a book on Git being published by Apress called "Pro Git", which is being licensed under a CC 3.0 license and as I've just finished some of the final reviews, I've put the entire content of the book online at:

http://progit.org

It should be shipping at the end of August, I think, but I just wanted to let people know that there is another resource out there to help learn Git. This one was actually technically edited by Shawn, too, so hopefully not too many serious errors of mine got through.

I've added a link to it on http://git-scm.com under the Books section, in case you want to point any newbies there. Hope this helps take some teaching load off some of your plates.

Thanks, Scott

On Mon, Jul 27, 2009 at 1:56 PM, Scott Chacon<schacon@gmail.com> wrote:

Thanks so much, Scott. :)

On Mon, Jul 27, 2009 at 10:56:57AM -0700, Scott Chacon wrote:

Good stuff, Thanks Scott.

In http://progit.org/book/ch7-1.html we go through a lot of machinations to setup an external diff viewer.

That might be a good time to introduce git-difftool, even if only to mention that the setup is much simpler when difftool is used. It allows you to do without the wrapper scripts.

$ p4=/Applications/p4.merge.app/Contents/MacOS/p4merge $ git config --global difftool.p4.cmd "$p4 \"\$LOCAL\" \"\$REMOTE\"" $ git difftool -t p4

$ git config --global diff.tool p4 $ git difftool

It's even easier if you use one of the several built-in tools, e.g. opendiff, kompare, meld, etc., since it requires no configuration.

Mentioning that it's a fairly new feature is probably important, too. Hmm. I guess I should've send a patch ;-)

Have fun,

Hey,

On Tue, Jul 28, 2009 at 1:56 AM, David Aguilar<davvid@gmail.com> wrote:

That's a good point - I never actually covered that, it looks like. I'll put that in the list of things to cover for the second edition :)

If you are interested in contributing and don't mind releasing the rights to your contributions to also be published commercially under a second edition in the future, please feel free to fork the project on GitHub and send me a pull request for anything you add. I've already gotten errata in this manner, which is pretty cool. Otherwise I'll try to get this in eventually.

Thanks, Scott

Scott Chacon <schacon@gmail.com> writes:

Wonderfull news! Thanks a lot for publishing it under Creative Commons (CC-BY-NC-SA 3.0) license for all to see (and improve).

I'll send a few comments later (BTW. would you prefer to have it here, or private?).

One comment about on-line version: it might be better to have one chapter and not one (sub)section per HTML page. There are some sections that are not enough to even fill one single page.

Hey,

On Wed, Jul 29, 2009 at 2:34 AM, Jakub Narebski<jnareb@gmail.com> wrote:

You can either email them to me or fork the markdown source
(http://github.com/progit/progit) and send me a pull request or patch.
 Or just push fixes to your fork - I've been checking them pretty
often since people are starting to translate it on GitHub.

I agree that some of the pages are small, but I like being able to point someone at a section for help with something - a whole chapter I think would be overwhelming. Eventually I'd like to possibly add a commenting system inline and having one per section would be a lot more manageable.

Thanks, Scott

Heya,

On Wed, Jul 29, 2009 at 08:38, Scott Chacon<schacon@gmail.com> wrote:

Why not use an anchor for that purpose?

On Mon, Jul 27, 2009 at 10:56:57AM -0700, Scott Chacon wrote:

Many thanks for that. It's an interesting reading. Is it updated often? There're some typos.

Also, a comment. When you show how to setup a git server with ssh, you have: $ su git $ cd $ mkdir .ssh

After su make sure umask doesn't allow group-writable, or the ssh daemon will complay about wrong permissions in .ssh and .ssh/authorized_keys.

$ su git $ umask 077 $ ..

And reset to more generous defaults after finishing with ssh setup. (Like by saving the previous value or just using 022.)

Regards, Luciano Rocha