X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tour.mdwn;h=2721d8007ab29dfab5e521ddc75bd26f67839587;hb=dfe58ad6f32b7e2ed01b1cfbd522018246d8c389;hp=1d8435be1b6626b051cd5ed87e901b4afc06243b;hpb=7fe6568ea41eb049a96604ec50b034646c399515;p=hgbook-git diff --git a/tour.mdwn b/tour.mdwn index 1d8435b..2721d80 100644 --- a/tour.mdwn +++ b/tour.mdwn @@ -1,10 +1,12 @@ ## Chapter 2 -A tour of Mercurial: the basics +A tour of git: the basics ### 2.0 Copyright -Distributed revision control with Mercurial -Bryan O’Sullivan +This document is a modified version originally known as "Distributed +revision control with Mercurial" and originally authored by Bryan +O’Sullivan. The original document was obtained from +. Copyright © 2006, 2007 Bryan O’Sullivan. @@ -12,74 +14,83 @@ This material may be distributed only subject to the terms and conditions set forth in version 1.0 of the Open Publication License. Please refer to Appendix D for the license text. -### 2.1 Installing Mercurial on your system +As this is a modified version, the name of Bryan O'Sullivan is used +only to properly credit him with the original text. The appearance of +his name here explicitly does not assert or imply his endorsement of +this modified document. -Prebuilt binary packages of Mercurial are available for every popular -operating system. These make it easy to start using Mercurial on your +Portions Copyright © 2007 Carl Worth. + +Changes made by Carl include the following: + + * 2007-09-27: + * Convert from HTML to markdown source syntax + * Eliminate all content except Chapter 2 and Appendix D + * Eliminate line numbers from examples + * Modified to describe git instead of mercurial + +### 2.1 Installing git on your system + +Prebuilt binary packages of git are available for many popular +operating systems. These make it easy to start using git on your computer immediately. #### 2.1.1 Linux Because each Linux distribution has its own packaging tools, policies, and rate of development, it’s difficult to give a comprehensive set of -instructions on how to install Mercurial binaries. The version of -Mercurial that you will end up with can vary depending on how active +instructions on how to install git binaries. The version of +git that you will end up with can vary depending on how active the person is who maintains the package for your distribution. -To keep things simple, I will focus on installing Mercurial from the +To keep things simple, I will focus on installing git from the command line under the most popular Linux distributions. Most of these distributions provide graphical package managers that will let you -install Mercurial with a single click; the package name to look for is -mercurial. +install git with a single click. The package name to look for is +often git, but is sometimes git-core, (due to an unfortunate name +with git, meaning GNU Interactive Tools). * Debian - apt-get install mercurial + apt-get install git-core * Fedora Core - yum install mercurial + yum install git * Gentoo - emerge mercurial + emerge git * OpenSUSE - yum install mercurial - - * Ubuntu Ubuntu’s Mercurial package is based on Debian’s. To install -it, run the following command. - - apt-get install mercurial - -The Ubuntu package for Mercurial tends to lag behind the Debian -version by a considerable time margin (at the time of writing, seven -months), which in some cases will mean that on Ubuntu, you may run -into problems that have since been fixed in the Debian package. + yum install git -#### 2.1.2 Solaris + * Ubuntu -XXX. + apt-get install git -#### 2.1.3 Mac OS X +#### 2.1.2 Mac OS X -Lee Cantey publishes an installer of Mercurial for Mac OS X at -[http://mercurial.berkwood.com][6]. This package works on both -Intel- and Power-based Macs. Before you can use it, you must install a -compatible version of Universal MacPython [[BI][7]]. This is easy to -do; simply follow the instructions on Lee’s site. +A git-core package is available through +[macports](http://macports.org). Once macports is enabled, the command +to install git is: -#### 2.1.4 Windows + port install git-core -Lee Cantey also publishes an installer of Mercurial for Windows at -[http://mercurial.berkwood.com][6]. This package has no external -dependencies; it “just works”. +#### 2.1.3 Windows -Note: The Windows version of Mercurial does not automatically convert -line endings between Windows and Unix styles. If you want to share -work with Unix users, you must do a little additional configuration -work. XXX Flesh this out. +Git has long been available as part of cygwin, and works reasonably +well in that environment. Some people find cygwin a particularly +inelegant approach to running git and would prefer a "native" +solution. To this end, the [msysgit +project](http://code.google.com/p/msysgit/) is rapidly putting +together a solution including various packages with full +installers. These include GitMe, a package to install the entire +development environment necessary to work on improving the msysgit +port of git, and WinGit, a package for installing just git itself +without the development environment, (still in Alpha as of September +2008). ### 2.2 Getting started